From f07b4a876ea81c94fac4967a3b98bd97c38faf94 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 22 Jul 2000 08:38:06 +0000 Subject: [PATCH] Fix resource handling, the resource file got left out from the DLL after 2000-07-22 Tor Lillqvist * 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. --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-0 | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-12 | 8 ++++++++ ChangeLog.pre-2-2 | 8 ++++++++ ChangeLog.pre-2-4 | 8 ++++++++ ChangeLog.pre-2-6 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ build-dll | 12 ++++-------- glib.def | 2 ++ glib/glib.def | 2 ++ gmodule/ChangeLog | 5 +++++ gmodule/makefile.mingw.in | 5 +---- 13 files changed, 78 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9bb85dd..b00a136 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2000-07-22 Tor Lillqvist + + * 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. + 2000-07-20 Sebastian Wilhelmi * gutils.c, glib.h: Mark the functions g_basename and g_dirname diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 9bb85dd..b00a136 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,11 @@ +2000-07-22 Tor Lillqvist + + * 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. + 2000-07-20 Sebastian Wilhelmi * gutils.c, glib.h: Mark the functions g_basename and g_dirname diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 9bb85dd..b00a136 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +2000-07-22 Tor Lillqvist + + * 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. + 2000-07-20 Sebastian Wilhelmi * gutils.c, glib.h: Mark the functions g_basename and g_dirname diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 9bb85dd..b00a136 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,11 @@ +2000-07-22 Tor Lillqvist + + * 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. + 2000-07-20 Sebastian Wilhelmi * gutils.c, glib.h: Mark the functions g_basename and g_dirname diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 9bb85dd..b00a136 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +2000-07-22 Tor Lillqvist + + * 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. + 2000-07-20 Sebastian Wilhelmi * gutils.c, glib.h: Mark the functions g_basename and g_dirname diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 9bb85dd..b00a136 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +2000-07-22 Tor Lillqvist + + * 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. + 2000-07-20 Sebastian Wilhelmi * gutils.c, glib.h: Mark the functions g_basename and g_dirname diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 9bb85dd..b00a136 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +2000-07-22 Tor Lillqvist + + * 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. + 2000-07-20 Sebastian Wilhelmi * gutils.c, glib.h: Mark the functions g_basename and g_dirname diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 9bb85dd..b00a136 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +2000-07-22 Tor Lillqvist + + * 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. + 2000-07-20 Sebastian Wilhelmi * gutils.c, glib.h: Mark the functions g_basename and g_dirname diff --git a/build-dll b/build-dll index 0d1f6f0..61efb01 100644 --- a/build-dll +++ b/build-dll @@ -3,8 +3,8 @@ # Temporary hack until building dlls is easier with gcc -mno-cygwin # ("mingw32"). -# This is usable with cygwin b20.1 and gcc-2.95.2 as distributed by -# Mumit Khan. For other combinations, no idea. +# This is usable with cygwin 1.1.x and gcc-2.95.2 for mingw as +# distributed by Mumit Khan. For other combinations, no idea. GCC="gcc" DLLTOOL="dlltool" @@ -31,13 +31,9 @@ done # Check if we have a resource file for this DLL. resfile="" if [ -f $library.rc ]; then - # Kludge to get the path to the win32 headers. Should work for both - # gcc running on cygwin, and bare mingw gcc, even if the make is - # running on cygwin (whew). - WIN32APIHEADERS=`echo "\#include " | $GCC -M -E - | tail -1 | sed -e 's![\\/]winver.h!!' | tr -d '\015'` - resfile=$library-win32res.o objs="$objs $resfile" + ldargs="$ldargs $resfile" # Check if we have a build number stamp file. if [ -f $library-build.stamp ]; then @@ -51,7 +47,7 @@ if [ -f $library.rc ]; then fi m4 -DBUILDNUMBER=$buildnumber <$library.rc >$library-win32res.rc - windres --include-dir $WIN32APIHEADERS $library-win32res.rc $library-win32res.o + windres $library-win32res.rc $library-win32res.o rm $library-win32res.rc fi diff --git a/glib.def b/glib.def index ac57b36..479ff5f 100644 --- a/glib.def +++ b/glib.def @@ -251,6 +251,8 @@ EXPORTS g_on_error_query g_on_error_stack_trace g_parse_debug_string + g_path_get_basename + g_path_get_dirname g_path_is_absolute g_path_skip_root g_pipe_readable_msg diff --git a/glib/glib.def b/glib/glib.def index ac57b36..479ff5f 100644 --- a/glib/glib.def +++ b/glib/glib.def @@ -251,6 +251,8 @@ EXPORTS g_on_error_query g_on_error_stack_trace g_parse_debug_string + g_path_get_basename + g_path_get_dirname g_path_is_absolute g_path_skip_root g_pipe_readable_msg diff --git a/gmodule/ChangeLog b/gmodule/ChangeLog index 56e8c9d..2411405 100644 --- a/gmodule/ChangeLog +++ b/gmodule/ChangeLog @@ -1,3 +1,8 @@ +2000-07-22 Tor Lillqvist + + * makefile.mingw.in: Remove leftover gmodule-win32res.o stuff. The + build-dll script automagically handles resources. + 2000-07-20 Sebastian Wilhelmi * libgplugin_a.c, testgmodule.c: Use g_path_get_basename instead diff --git a/gmodule/makefile.mingw.in b/gmodule/makefile.mingw.in index 6ae7214..e127c0f 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 -- 2.7.4