From 6208120896a0973d74492083c6411fbbc2f2a7a6 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 27 Oct 2000 21:35:45 +0000 Subject: [PATCH] Make glib-genmarshal.exe. 2000-10-28 Tor Lillqvist * makefile.{mingw,msc}.in: Make glib-genmarshal.exe. * glib-genmarshal.c: Conditionalise include of unistd.h. Include on Win32. * gobject.def: Add some missing entry points. --- gobject/ChangeLog | 9 +++++++++ gobject/glib-genmarshal.c | 8 ++++++++ gobject/gobject.def | 7 +++++++ gobject/makefile.mingw.in | 8 ++++++-- gobject/makefile.msc.in | 8 ++++++-- 5 files changed, 36 insertions(+), 4 deletions(-) diff --git a/gobject/ChangeLog b/gobject/ChangeLog index 636d03a..2a76728 100644 --- a/gobject/ChangeLog +++ b/gobject/ChangeLog @@ -1,3 +1,12 @@ +2000-10-28 Tor Lillqvist + + * makefile.{mingw,msc}.in: Make glib-genmarshal.exe. + + * glib-genmarshal.c: Conditionalise include of unistd.h. + Include on Win32. + + * gobject.def: Add some missing entry points. + Fri Oct 27 16:33:41 2000 Tim Janik * gsignal.[hc]: publically define GSignalInvocationHint structure diff --git a/gobject/glib-genmarshal.c b/gobject/glib-genmarshal.c index b13d769..d702dad 100644 --- 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 #include +#include #include #include #include +#ifdef HAVE_UNISTD_H #include +#endif #include #include +#ifdef G_OS_WIN32 +#include +#endif /* --- defines --- */ #define PRG_NAME "glib-genmarshal" diff --git a/gobject/gobject.def b/gobject/gobject.def index d407e75..dfb8eb1 100644 --- 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 e56b46c..80fb539 100644 --- 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 05540ed..df5eae8 100644 --- 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 -- 2.7.4