diff options
| author | Tor Lillqvist <tml@iki.fi> | 2001-09-04 05:09:35 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2001-09-04 05:09:35 +0000 |
| commit | 07741c07d814bfd86998dfed1a5da347bb9335bd (patch) | |
| tree | d36395163ddec43e0a0c35efd40bf532a1f3f677 /gmodule | |
| parent | 267ff610fe145f555ce63ee0670daed960e3bc1a (diff) | |
Update. Don't mention pthreads.
2001-09-04 Tor Lillqvist <tml@iki.fi>
* README.win32: Update. Don't mention pthreads.
* build-dll: Remove, moved to the build module.
* glibconfig.h.win32.in: Don't mention pthreds here, either.
* glib/gstrfuncs.c: Mark the correct variable for export from DLL.
* glib/giowin32.c (g_io_win32_msg_create_watch): Owen forgot to
rename the win32_watch_funcs variable here, too.
* */makefile.mingw.in: Don't use version number in import library
name. Use whole version number in DLL name. Use build-dll from the
build module.
Diffstat (limited to 'gmodule')
| -rw-r--r-- | gmodule/gmoduleconf.h.win32 | 1 | ||||
| -rw-r--r-- | gmodule/makefile.mingw.in | 42 |
2 files changed, 21 insertions, 22 deletions
diff --git a/gmodule/gmoduleconf.h.win32 b/gmodule/gmoduleconf.h.win32 index 377a631bc..18bee9b35 100644 --- a/gmodule/gmoduleconf.h.win32 +++ b/gmodule/gmoduleconf.h.win32 @@ -31,6 +31,7 @@ extern "C" { #define G_MODULE_IMPL_WIN32 3 #define G_MODULE_IMPL_OS2 4 #define G_MODULE_IMPL_BEOS 5 +#define G_MODULE_IMPL_DYLD 6 #define G_MODULE_IMPL G_MODULE_IMPL_WIN32 #undef G_MODULE_HAVE_DLERROR diff --git a/gmodule/makefile.mingw.in b/gmodule/makefile.mingw.in index 6f1b4ad40..416c7d4da 100644 --- a/gmodule/makefile.mingw.in +++ b/gmodule/makefile.mingw.in @@ -7,9 +7,6 @@ TOP = ../.. include ../build/win32/make.mingw -# Possibly override GLib version in build\win32\module.defs -GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@ - ################################################################ # Nothing much configurable below @@ -17,17 +14,15 @@ GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@ INCLUDES = -I .. -I ../glib -I . DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GModule\" -DG_ENABLE_DEBUG -BUILD_DLL = ../build-dll - all : \ gmoduleconf.h \ - gmodule-$(GLIB_VER).dll \ - testgmodule.exe + gmodule-@GLIB_VERSION@.dll \ + testgmodule.exe \ + libgplugin_a.dll libgplugin_b.dll ifeq ($(wildcard makefile.mingw.in),makefile.mingw.in) makefile.mingw: makefile.mingw.in - sed -e 's,@GLIB[_]MAJOR_VERSION@,@GLIB_MAJOR_VERSION@,' \ - -e 's,@GLIB[_]MINOR_VERSION@,@GLIB_MINOR_VERSION@,' <$< >$@ + sed -e 's,@GLIB[_]VERSION@,@GLIB_VERSION@,' <$< >$@ endif gmodule_OBJECTS = \ @@ -36,23 +31,26 @@ gmodule_OBJECTS = \ gmoduleconf.h: gmoduleconf.h.win32 cp $< $@ -gmodule-$(GLIB_VER).dll : $(gmodule_OBJECTS) gmodule.def - $(BUILD_DLL) gmodule $(GLIB_VER) gmodule.def $(gmodule_OBJECTS) -L ../glib -lglib-$(GLIB_VER) +################ The gmodule DLL + +gmodule-@GLIB_VERSION@.dll : $(gmodule_OBJECTS) gmodule.def + $(BUILD_DLL) gmodule @GLIB_VERSION@ $(CFLAGS) gmodule.def $(gmodule_OBJECTS) -L ../glib -lglib ################ test prog -testgmodule.exe : gmodule-$(GLIB_VER).dll testgmodule.o libgplugin_a.dll libgplugin_b.dll -# Wow, do we really have to do it like this to get some symbols -# exported from a .exe? Apparently yes. Does the __declspec(dllexport) -# actually do anything in gcc? - $(CC) $(CFLAGS) -Wl,--base-file,testgmodule.base -o testgmodule.exe testgmodule.o -L ../glib -lglib-$(GLIB_VER) -L . -lgmodule-$(GLIB_VER) $(LDFLAGS) - $(DLLTOOL) --base-file testgmodule.base --output-exp testgmodule.exp testgmodule.o - $(CC) $(CFLAGS) -Wl,--base-file,testgmodule.base,testgmodule.exp -o testgmodule.exe testgmodule.o -L ../glib -lglib-$(GLIB_VER) -L . -lgmodule-$(GLIB_VER) $(LDFLAGS) - $(DLLTOOL) --base-file testgmodule.base --output-exp testgmodule.exp testgmodule.o - $(CC) $(CFLAGS) -Wl,testgmodule.exp -o testgmodule.exe testgmodule.o -L ../glib -lglib-$(GLIB_VER) -L . -lgmodule-$(GLIB_VER) $(LDFLAGS) +testgmodule.exe : gmodule-@GLIB_VERSION@.dll testgmodule.o +# We have to generate an .exp file separately with dlltool, and link +# with that. Sigh. + dlltool --output-exp testgmodule.exp testgmodule.o + $(CC) $(CFLAGS) -o testgmodule.exe testgmodule.o testgmodule.exp -L ../glib -lglib -L . -lgmodule $(LFLAGS) libgplugin_a.dll : libgplugin_a.o - $(BUILD_DLL) libgplugin_a - - libgplugin_a.o -L ../glib -lglib-$(GLIB_VER) -L . -lgmodule-$(GLIB_VER) + $(BUILD_DLL) libgplugin_a - libgplugin_a.o -L ../glib -lglib -L . -lgmodule libgplugin_b.dll : libgplugin_b.o - $(BUILD_DLL) libgplugin_b - - libgplugin_b.o -L ../glib -lglib-$(GLIB_VER) -L . -lgmodule-$(GLIB_VER) + $(BUILD_DLL) libgplugin_b - libgplugin_b.o -L ../glib -lglib -L . -lgmodule + +################ Other stuff + +clean:: + -rm gmoduleconf.h |