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 /build-dll | |
| 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 'build-dll')
| -rw-r--r-- | build-dll | 12 |
1 files changed, 4 insertions, 8 deletions
@@ -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 <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 |