Make glib-genmarshal.exe.

2000-10-28  Tor Lillqvist  <tml@iki.fi>

	* makefile.{mingw,msc}.in: Make glib-genmarshal.exe.

	* glib-genmarshal.c: Conditionalise include of unistd.h.
	Include <io.h> on Win32.

	* gobject.def: Add some missing entry points.

diff --git a/gobject/ChangeLog b/gobject/ChangeLog
index 636d03a4c43082a59b853845d8b1ac1c332a32a0..2a767286ff5e7a811267cc78c0b6f51dfbc8c6bb 100644 (file)
--- a/gobject/ChangeLog
+++ b/gobject/ChangeLog
@@ -1,3 +1,12 @@
+2000-10-28  Tor Lillqvist  <tml@iki.fi>
+
+       * makefile.{mingw,msc}.in: Make glib-genmarshal.exe.
+
+       * glib-genmarshal.c: Conditionalise include of unistd.h.
+       Include <io.h> on Win32.
+
+       * gobject.def: Add some missing entry points.
+
 Fri Oct 27 16:33:41 2000  Tim Janik  <timj@gtk.org>
 
        * gsignal.[hc]: publically define GSignalInvocationHint structure

diff --git a/gobject/glib-genmarshal.c b/gobject/glib-genmarshal.c
index b13d7693632ac002fd677e63362945987633ea3c..d702dadcae95976330f064f5e7089d025a20b10f 100644 (file)
--- a/gobject/glib-genmarshal.c
+++ b/gobject/glib-genmarshal.c
@@ -16,16 +16,24 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+#include       "config.h"
+
 #include       <glib-object.h>
 
 #include       <stdio.h>
+#include       <stdlib.h>
 #include       <fcntl.h>
 #include       <string.h>
 #include       <errno.h>
+#ifdef HAVE_UNISTD_H
 #include       <unistd.h>
+#endif
 #include       <sys/types.h>
 #include       <sys/stat.h>
 
+#ifdef G_OS_WIN32
+#include <io.h>
+#endif
 
 /* --- defines --- */
 #define        PRG_NAME        "glib-genmarshal"

diff --git a/gobject/gobject.def b/gobject/gobject.def
index d407e75b11f3ddef0352b79ed7ff51e4f6a82371..dfb8eb17fe680896ec78eef84d45b2b0908d12b7 100644 (file)
--- a/gobject/gobject.def
+++ b/gobject/gobject.def
@@ -6,6 +6,8 @@ EXPORTS
        g_bsearch_array_remove
        g_bsearch_array_remove_node
        g_cclosure_new
+       g_cclosure_new_object
+       g_cclosure_new_object_swap
        g_cclosure_new_swap
        g_closure_add_fnotify
        g_closure_add_inotify
@@ -46,6 +48,7 @@ EXPORTS
        g_object_set_valist
        g_object_steal_qdata
        g_object_unref
+       g_object_watch_closure
        g_param_spec_boolean
        g_param_spec_char
        g_param_spec_double
@@ -121,6 +124,7 @@ EXPORTS
        g_value_dup_boxed
        g_value_dup_object
        g_value_dup_string
+       g_value_get_as_pointer
        g_value_get_boolean
        g_value_get_boxed
        g_value_get_char
@@ -131,6 +135,7 @@ EXPORTS
        g_value_get_int
        g_value_get_long
        g_value_get_object
+       g_value_get_pointer
        g_value_get_string
        g_value_get_uchar
        g_value_get_uint
@@ -147,7 +152,9 @@ EXPORTS
        g_value_set_int
        g_value_set_long
        g_value_set_object
+       g_value_set_pointer
        g_value_set_static_boxed
+       g_value_set_static_string
        g_value_set_string
        g_value_set_uchar
        g_value_set_uint

diff --git a/gobject/makefile.mingw.in b/gobject/makefile.mingw.in
index e56b46c993ee19ae01d38deb26523d9ba8cb0387..80fb53982f37585a626fb3a196525b8d7345a609 100644 (file)
--- a/gobject/makefile.mingw.in
+++ b/gobject/makefile.mingw.in
@@ -20,8 +20,9 @@ DEFINES = -DHAVE_CONFIG_H -DGOBJECT_COMPILATION -DG_LOG_DOMAIN=g_log_domain_gobj
 
 BUILD_DLL = ../build-dll
 
-all : \
-       gobject-$(GLIB_VER).dll
+all :                          \
+       gobject-$(GLIB_VER).dll \
+       glib-genmarshal.exe
 
 makefile.mingw: makefile.mingw.in
        sed -e 's,@GLIB[_]MAJOR_VERSION@,@GLIB_MAJOR_VERSION@,' \
@@ -42,3 +43,6 @@ gobject_OBJECTS =             \
 
 gobject-$(GLIB_VER).dll : $(gobject_OBJECTS) gobject.def
        $(BUILD_DLL) gobject $(GLIB_VER) gobject.def $(gobject_OBJECTS) -L .. -lglib-$(GLIB_VER)
+
+glib-genmarshal.exe : glib-genmarshal.c
+       $(CC) -o $@ $(CFLAGS) -UGOBJECT_COMPILATION -DG_LOG_DOMAIN=\"glib-genmarshal\" $< -L .. -lglib-$(GLIB_VER) -L . -lgobject-$(GLIB_VER)

diff --git a/gobject/makefile.msc.in b/gobject/makefile.msc.in
index 05540ed546e90fac7016236b7acb162846fe7e2a..df5eae83709717f9a1b8657bf3c92811c17122a3 100644 (file)
--- a/gobject/makefile.msc.in
+++ b/gobject/makefile.msc.in
@@ -15,8 +15,9 @@ GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
 INCLUDES = -I .. -I .
 DEFINES = -DHAVE_CONFIG_H -DGOBJECT_COMPILATION -DG_LOG_DOMAIN=g_log_domain_gobject
 
-all : \
-       gobject-$(GLIB_VER).dll
+all :                          \
+       gobject-$(GLIB_VER).dll \
+       glib-genmarshal.exe
 
 gobject_OBJECTS =              \
        gboxed.obj              \
@@ -37,3 +38,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 -DG_LOG_DOMAIN=\"glib-genmarshal\" glib-genmarshal.c ..\glib-$(GLIB_VER).lib gobject-$(GLIB_VER).lib