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.

ChangeLog

@@ -1,3 +1,11 @@
+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.
+
 2000-07-20  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
 	* gutils.c, glib.h: Mark the functions g_basename and g_dirname

ChangeLog.pre-2-0

@@ -1,3 +1,11 @@
+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.
+
 2000-07-20  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
 	* gutils.c, glib.h: Mark the functions g_basename and g_dirname

ChangeLog.pre-2-10

@@ -1,3 +1,11 @@
+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.
+
 2000-07-20  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
 	* gutils.c, glib.h: Mark the functions g_basename and g_dirname

ChangeLog.pre-2-12

@@ -1,3 +1,11 @@
+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.
+
 2000-07-20  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
 	* gutils.c, glib.h: Mark the functions g_basename and g_dirname

ChangeLog.pre-2-2

@@ -1,3 +1,11 @@
+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.
+
 2000-07-20  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
 	* gutils.c, glib.h: Mark the functions g_basename and g_dirname

ChangeLog.pre-2-4

@@ -1,3 +1,11 @@
+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.
+
 2000-07-20  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
 	* gutils.c, glib.h: Mark the functions g_basename and g_dirname

ChangeLog.pre-2-6

@@ -1,3 +1,11 @@
+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.
+
 2000-07-20  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
 	* gutils.c, glib.h: Mark the functions g_basename and g_dirname

ChangeLog.pre-2-8

@@ -1,3 +1,11 @@
+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.
+
 2000-07-20  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
 	* gutils.c, glib.h: Mark the functions g_basename and g_dirname

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
+# This is usable with cygwin 1.1.x and gcc-2.95.2 for mingw as
-# Mumit Khan. For other combinations, no idea.
+# 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 <winver.h>" | $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
 

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

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

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

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