luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-05 02:36:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make glib-genmarshal.exe.

Browse Source 
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.
This commit is contained in:
Tor Lillqvist 2000-10-27 21:35:45 +00:00 committed by Tor Lillqvist
parent 09683edc5c
commit 6208120896
5 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gobject/ChangeLog
View File

@ -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> Fri Oct 27 16:33:41 2000 Tim Janik <timj@gtk.org>
* gsignal.[hc]: publically define GSignalInvocationHint structure * gsignal.[hc]: publically define GSignalInvocationHint structure

8
gobject/glib-genmarshal.c
View File

@ -16,16 +16,24 @@
* Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#include "config.h"
#include <glib-object.h> #include <glib-object.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include <fcntl.h> #include <fcntl.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>
#endif
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#ifdef G_OS_WIN32
#include <io.h>
#endif
/* --- defines --- */ /* --- defines --- */
#define PRG_NAME "glib-genmarshal" #define PRG_NAME "glib-genmarshal"

7
gobject/gobject.def
View File

@ -6,6 +6,8 @@ EXPORTS
g_bsearch_array_remove g_bsearch_array_remove
g_bsearch_array_remove_node g_bsearch_array_remove_node
g_cclosure_new g_cclosure_new
g_cclosure_new_object
g_cclosure_new_object_swap
g_cclosure_new_swap g_cclosure_new_swap
g_closure_add_fnotify g_closure_add_fnotify
g_closure_add_inotify g_closure_add_inotify
@ -46,6 +48,7 @@ EXPORTS
g_object_set_valist g_object_set_valist
g_object_steal_qdata g_object_steal_qdata
g_object_unref g_object_unref
g_object_watch_closure
g_param_spec_boolean g_param_spec_boolean
g_param_spec_char g_param_spec_char
g_param_spec_double g_param_spec_double
@ -121,6 +124,7 @@ EXPORTS
g_value_dup_boxed g_value_dup_boxed
g_value_dup_object g_value_dup_object
g_value_dup_string g_value_dup_string
g_value_get_as_pointer
g_value_get_boolean g_value_get_boolean
g_value_get_boxed g_value_get_boxed
g_value_get_char g_value_get_char
@ -131,6 +135,7 @@ EXPORTS
g_value_get_int g_value_get_int
g_value_get_long g_value_get_long
g_value_get_object g_value_get_object
g_value_get_pointer
g_value_get_string g_value_get_string
g_value_get_uchar g_value_get_uchar
g_value_get_uint g_value_get_uint
@ -147,7 +152,9 @@ EXPORTS
g_value_set_int g_value_set_int
g_value_set_long g_value_set_long
g_value_set_object g_value_set_object
g_value_set_pointer
g_value_set_static_boxed g_value_set_static_boxed
g_value_set_static_string
g_value_set_string g_value_set_string
g_value_set_uchar g_value_set_uchar
g_value_set_uint g_value_set_uint

6
gobject/makefile.mingw.in
View File

@ -21,7 +21,8 @@ DEFINES = -DHAVE_CONFIG_H -DGOBJECT_COMPILATION -DG_LOG_DOMAIN=g_log_domain_gobj
BUILD_DLL = ../build-dll BUILD_DLL = ../build-dll
all : \ all : \
gobject-$(GLIB_VER).dll gobject-$(GLIB_VER).dll \
glib-genmarshal.exe
makefile.mingw: makefile.mingw.in makefile.mingw: makefile.mingw.in
sed -e 's,@GLIB[_]MAJOR_VERSION@,@GLIB_MAJOR_VERSION@,' \ sed -e 's,@GLIB[_]MAJOR_VERSION@,@GLIB_MAJOR_VERSION@,' \
@ -42,3 +43,6 @@ gobject_OBJECTS = \
gobject-$(GLIB_VER).dll : $(gobject_OBJECTS) gobject.def gobject-$(GLIB_VER).dll : $(gobject_OBJECTS) gobject.def
$(BUILD_DLL) gobject $(GLIB_VER) gobject.def $(gobject_OBJECTS) -L .. -lglib-$(GLIB_VER) $(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)

6
gobject/makefile.msc.in
View File

@ -16,7 +16,8 @@ INCLUDES = -I .. -I .
DEFINES = -DHAVE_CONFIG_H -DGOBJECT_COMPILATION -DG_LOG_DOMAIN=g_log_domain_gobject DEFINES = -DHAVE_CONFIG_H -DGOBJECT_COMPILATION -DG_LOG_DOMAIN=g_log_domain_gobject
all : \ all : \
gobject-$(GLIB_VER).dll gobject-$(GLIB_VER).dll \
glib-genmarshal.exe
gobject_OBJECTS = \ gobject_OBJECTS = \
gboxed.obj \ gboxed.obj \
@ -37,3 +38,6 @@ makefile.msc: makefile.msc.in
gobject-$(GLIB_VER).dll : $(gobject_OBJECTS) gobject.def 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) -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