mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-12-25 15:06:14 +01:00
changed depndencies to build glib-genmarshal first and statically linked
2001-05-24 Hans Breuer <hans@breuer.org> * makefile.msc.in : changed depndencies to build glib-genmarshal first and statically linked with glib, which makes it independent from the installed glib version. Added new object files to build. * gobject.def : updated
This commit is contained in:
parent
e181176f90
commit
c990a0c4c6
@ -1,3 +1,11 @@
|
||||
2001-05-24 Hans Breuer <hans@breuer.org>
|
||||
|
||||
* makefile.msc.in : changed depndencies to build glib-genmarshal
|
||||
first and statically linked with glib, which makes it independent
|
||||
from the installed glib version. Added new object files to build.
|
||||
|
||||
* gobject.def : updated
|
||||
|
||||
Thu May 24 08:52:02 2001 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gobject.[ch] (g_value_set_object): gpointer, not
|
||||
|
@ -11,6 +11,7 @@ EXPORTS
|
||||
g_bsearch_array_remove
|
||||
g_bsearch_array_remove_node
|
||||
g_cclosure_marshal_STRING__OBJECT_POINTER
|
||||
g_cclosure_marshal_VOID__BOOLEAN
|
||||
g_cclosure_marshal_VOID__INT
|
||||
g_cclosure_marshal_VOID__POINTER
|
||||
g_cclosure_marshal_VOID__UINT
|
||||
|
@ -16,8 +16,10 @@ INCLUDES = -I .. -I .
|
||||
DEFINES = -DHAVE_CONFIG_H -DGOBJECT_COMPILATION -DG_LOG_DOMAIN=g_log_domain_gruntime -DG_ENABLE_DEBUG
|
||||
|
||||
all : \
|
||||
glib-genmarshal.exe \
|
||||
gmarshal.h \
|
||||
gmarshal.c \
|
||||
gobject-$(GLIB_VER).dll \
|
||||
glib-genmarshal.exe
|
||||
|
||||
gobject_OBJECTS = \
|
||||
gboxed.obj \
|
||||
@ -32,7 +34,9 @@ gobject_OBJECTS = \
|
||||
gtypemodule.obj \
|
||||
gtypeplugin.obj \
|
||||
gvalue.obj \
|
||||
gvaluetypes.obj
|
||||
gvaluearray.obj \
|
||||
gvaluetypes.obj \
|
||||
gvaluetransform.obj
|
||||
|
||||
gmarshal.h : gmarshal.list glib-genmarshal.exe
|
||||
echo #ifndef __G_MARSHAL_H__ > xgen-gmh
|
||||
@ -51,5 +55,6 @@ makefile.msc: makefile.msc.in
|
||||
gobject-$(GLIB_VER).dll : $(gobject_OBJECTS) gobject.def
|
||||
$(CC) $(CFLAGS) -LD -Fegobject-$(GLIB_VER).dll $(gobject_OBJECTS) ..\glib-$(GLIB_VER).lib $(LDFLAGS) /def:gobject.def
|
||||
|
||||
glib-genmarshal.exe : glib-genmarshal.c
|
||||
$(CC) -Fe$@ $(CFLAGS) -UGOBJECT_COMPILATION glib-genmarshal.c ..\glib-$(GLIB_VER).lib
|
||||
# link glib's static version to avoid installing
|
||||
glib-genmarshal.exe : glib-genmarshal.c ..\glib-$(GLIB_VER)s.lib
|
||||
$(CC) -Fe$@ $(CFLAGS) -UGOBJECT_COMPILATION glib-genmarshal.c ..\glib-$(GLIB_VER)s.lib user32.lib advapi32.lib $(INTL_LIBS)
|
||||
|
Loading…
Reference in New Issue
Block a user