updated externals

2001-07-20  Hans Breuer  <hans@breuer.org>

	* gobject.def : updated externals

	* makefile.msc.in : reflect glib move

diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index df693c4..bac03f7 100644 (file)
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,9 @@
+2001-07-20  Hans Breuer  <hans@breuer.org>
+
+       * gobject.def : updated externals
+
+       * makefile.msc.in : reflect glib move
+
 Tue Jul 10 18:50:16 2001  Tim Janik  <timj@gtk.org>
 
        * gsignal.h (struct _GSignalQuery): fix misplaced comment.

diff --git a/gobject/gobject.def b/gobject/gobject.def
index b8c1c68..5744b82 100644 (file)
--- a/gobject/gobject.def
+++ b/gobject/gobject.def
@@ -61,6 +61,7 @@ EXPORTS
        g_object_new_valist
        g_object_notify
        g_object_ref
+       g_object_run_dispose
        g_object_set
        g_object_set_data
        g_object_set_data_full
@@ -73,7 +74,8 @@ EXPORTS
        g_object_thaw_notify
        g_object_unref
        g_object_watch_closure
-       g_param_spec_pool_belongings
+       g_object_weak_ref
+       g_object_weak_unref
        g_param_spec_boolean
        g_param_spec_boxed
        g_param_spec_char
@@ -89,6 +91,7 @@ EXPORTS
        g_param_spec_pointer
        g_param_spec_pool_insert
        g_param_spec_pool_list
+       g_param_spec_pool_list_owned
        g_param_spec_pool_lookup
        g_param_spec_pool_remove
        g_param_spec_pool_new
@@ -129,7 +132,7 @@ EXPORTS
        g_signal_list_ids
        g_signal_lookup
        g_signal_name
-       g_signal_newc
+       g_signal_new
        g_signal_newv
        g_signal_new_valist
        g_signal_parse_name
@@ -164,6 +167,7 @@ EXPORTS
        g_type_get_plugin
        g_type_get_qdata
        g_type_init
+       g_type_init_with_debug_flags
        g_type_instance_is_a
        g_type_interface_add_prerequisite
        g_type_interface_peek

diff --git a/gobject/makefile.msc.in b/gobject/makefile.msc.in
index 8832268..81b4361 100644 (file)
--- a/gobject/makefile.msc.in
+++ b/gobject/makefile.msc.in
@@ -12,14 +12,18 @@ GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
 
 # Nothing much configurable below
 
-INCLUDES = -I .. -I .
-DEFINES = -DHAVE_CONFIG_H -DGOBJECT_COMPILATION -DG_LOG_DOMAIN=g_log_domain_gruntime -DG_ENABLE_DEBUG
+INCLUDES = -I .. -I . -I ..\glib
+DEFINES = -DHAVE_CONFIG_H -DGOBJECT_COMPILATION -DG_LOG_DOMAIN=g_log_domain_gruntime \
+               -DG_ENABLE_DEBUG
+#              -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS
+#              -DG_DISABLE_CAST_CHECKS
 
 all :                          \
        glib-genmarshal.exe \
        gmarshal.h \
        gmarshal.c \
        gobject-$(GLIB_VER).dll \
+       gobject-$(GLIB_VER)s.lib
 
 gobject_OBJECTS =              \
        gboxed.obj              \
@@ -53,8 +57,13 @@ makefile.msc: makefile.msc.in
               -e s,@GLIB[_]MINOR_VERSION@,@GLIB_MINOR_VERSION@, <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
+       $(CC) $(CFLAGS) -Fm -LD -Fegobject-$(GLIB_VER).dll $(gobject_OBJECTS) \
+       ..\glib\glib-$(GLIB_VER).lib $(LDFLAGS) /def:gobject.def
+
+gobject-$(GLIB_VER)s.lib : $(gobject_OBJECTS) 
+       lib /out:gobject-$(GLIB_VER)s.lib $(gobject_OBJECTS)
 
 # 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)
+glib-genmarshal.exe : glib-genmarshal.c ..\glib\glib-$(GLIB_VER)s.lib
+       $(CC) -Fe$@ $(CFLAGS) -UGOBJECT_COMPILATION glib-genmarshal.c \
+       ..\glib\glib-$(GLIB_VER)s.lib user32.lib advapi32.lib $(INTL_LIBS)