mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-09-20 09:16:15 +02:00
b74e7d2f47
2000-12-14 Tor Lillqvist <tml@iki.fi> * giowin32.c (g_io_win32_dispatch): Warn if no callback. Call callback correctly. (g_io_win32_create_watch): Fix typo. (g_io_win32_fd_create_watch): Ditto. (g_io_channel_unix_new): If it is a file descriptor (i.e., a Unix fd lookalike provided by the C library), call g_io_channel_win32_new_fd(). If it is a socket (from WinSock), call g_io_cahnnel_win32_new_stream_socket(). Hopefully sockets and fds don't overlap. TODO: Implement also datagram sockets. (g_io_channel_win32_poll): Call g_main_context_get_poll_func(). * gcompletion.h: Include <unistd.h> only on Unix. Is this inclusion really needed here? OTOH, do include <stddef.h>, for size_t. * gmessages.c: (Win32) Don't define a function called "write" that might clash with the prototype from <io.h>, use a #define. * glib.def: Update. * gmain.c (g_source_add_poll): Don't return a value from void function. (g_main_context_get_poll_func): Compile also for non-Win32, as presumably was intended. The result var is a GPollFunc, not a GPollFunc*. Return the result! gobject: 2000-12-14 Tor Lillqvist <tml@iki.fi> * makefile.mingw.in: Update, include parts from Makefile.am to build gmarshal.[ch]. Some day, we won't need these separate makefiles for Win32 compilation. I hope. * makefile.msc.in: Update. No use trying to build gmarshal.[ch] here, it would require Unixish tools. MSVC users building from CVS sources are out of luck. * gobject.def: Update.
47 lines
1.3 KiB
Plaintext
47 lines
1.3 KiB
Plaintext
## Makefile for building the gobject dll with Microsoft C
|
|
## Use: nmake -f makefile.msc install
|
|
|
|
TOP = ..\..
|
|
|
|
!INCLUDE ..\build\win32\make.msc
|
|
|
|
# Possibly override GLib version in build\win32\object.defs
|
|
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
|
|
|
|
all : \
|
|
gobject-$(GLIB_VER).dll \
|
|
glib-genmarshal.exe
|
|
|
|
gobject_OBJECTS = \
|
|
gboxed.obj \
|
|
gbsearcharray.obj \
|
|
gclosure.obj \
|
|
genums.obj \
|
|
gmarshal.obj \
|
|
gobject.obj \
|
|
gparam.obj \
|
|
gparamspecs.obj \
|
|
gsignal.obj \
|
|
gtype.obj \
|
|
gtypemodule.obj \
|
|
gtypeplugin.obj \
|
|
gvalue.obj \
|
|
gvaluetypes.obj
|
|
|
|
makefile.msc: makefile.msc.in
|
|
$(SED) -e s,@GLIB[_]MAJOR_VERSION@,@GLIB_MAJOR_VERSION@, \
|
|
-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
|
|
|
|
glib-genmarshal.exe : glib-genmarshal.c
|
|
$(CC) -Fe$@ $(CFLAGS) -UGOBJECT_COMPILATION glib-genmarshal.c ..\glib-$(GLIB_VER).lib gobject-$(GLIB_VER).lib
|