luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-23 22:16:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix resource handling, the resource file got left out from the DLL after

Browse Source 
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.
This commit is contained in:
Tor Lillqvist 2000-07-22 08:38:06 +00:00 committed by Tor Lillqvist
parent fec9828ac6
commit f07b4a876e
13 changed files with 78 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -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

8
ChangeLog.pre-2-0
View File

@ -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

8
ChangeLog.pre-2-10
View File

@ -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

8
ChangeLog.pre-2-12
View File

@ -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

8
ChangeLog.pre-2-2
View File

@ -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

8
ChangeLog.pre-2-4
View File

@ -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

8
ChangeLog.pre-2-6
View File

@ -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

8
ChangeLog.pre-2-8
View File

@ -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

12
build-dll
View File

@ -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

2
glib.def
View File

@ -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

2
glib/glib.def
View File

@ -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

5
gmodule/ChangeLog
View File

@ -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

5
gmodule/makefile.mingw.in
View File

@ -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