diff options
author | Tor Lillqvist <tml@iki.fi> | 2000-07-22 08:38:06 +0000 |
---|---|---|
committer | Tor Lillqvist <tml@src.gnome.org> | 2000-07-22 08:38:06 +0000 |
commit | f07b4a876ea81c94fac4967a3b98bd97c38faf94 (patch) | |
tree | e767ea151fc98f08de02d01f723124b1e592bea1 /gmodule | |
parent | fec9828ac62918374fb8aa94e15a9bdf554e269e (diff) | |
download | glib-f07b4a876ea81c94fac4967a3b98bd97c38faf94.tar.gz |
Fix resource handling, the resource file got left out from the DLL after
2000-07-22 Tor Lillqvist <tml@iki.fi>
* build-dll: Fix resource handling, the resource file got left out
from the DLL after all... Remove the WIN32APIHEADERS, not needed
with current windres.
* glib.def: Add new functions.
Diffstat (limited to 'gmodule')
-rw-r--r-- | gmodule/ChangeLog | 5 | ||||
-rw-r--r-- | gmodule/makefile.mingw.in | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/gmodule/ChangeLog b/gmodule/ChangeLog index 56e8c9d18..24114057e 100644 --- a/gmodule/ChangeLog +++ b/gmodule/ChangeLog @@ -1,3 +1,8 @@ +2000-07-22 Tor Lillqvist <tml@iki.fi> + + * makefile.mingw.in: Remove leftover gmodule-win32res.o stuff. The + build-dll script automagically handles resources. + 2000-07-20 Sebastian Wilhelmi <wilhelmi@ira.uka.de> * libgplugin_a.c, testgmodule.c: Use g_path_get_basename instead diff --git a/gmodule/makefile.mingw.in b/gmodule/makefile.mingw.in index 6ae721404..e127c0fd2 100644 --- a/gmodule/makefile.mingw.in +++ b/gmodule/makefile.mingw.in @@ -33,11 +33,8 @@ gmodule_OBJECTS = \ gmoduleconf.h: gmoduleconf.h.win32 cp $< $@ - -gmodule-win32res.o : gmodule.rc gmodule-build.tmp - gmodule-$(GLIB_VER).dll : $(gmodule_OBJECTS) gmodule.def - $(BUILD_DLL) gmodule $(GLIB_VER) gmodule.def $(gmodule_OBJECTS) gmodule-win32res.o -L .. -lglib-$(GLIB_VER) + $(BUILD_DLL) gmodule $(GLIB_VER) gmodule.def $(gmodule_OBJECTS) -L .. -lglib-$(GLIB_VER) ################ test prog |