mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-11-10 03:16:17 +01:00
make it compile again
2001-07-20 Hans Breuer <hans@breuer.org> * glib/glib/giowin32.c : make it compile again * glib/glib.def : updated exports * glib/makefile.msc.in : * glib/makefile.mingw.in : * tests/makefile.msc.in : reflect glib move * tests/mainloop-test.c : #include <io.h> for _pipe() * tests/gio-test.c : casts for strict compiler settings * makefile.msc.in : new master makefile reflecting the glib move. The '.in' isn't really needed anymore, because there is no version number in it
This commit is contained in:
Hans Breuer
Hans Breuer
parent
606033cffa
commit
847d8e9212
19
ChangeLog
19
ChangeLog
@ -1,3 +1,21 @@
|
||||
2001-07-20 Hans Breuer <hans@breuer.org>
|
||||
|
||||
* glib/glib/giowin32.c : make it compile again
|
||||
|
||||
* glib/glib.def : updated exports
|
||||
|
||||
* glib/makefile.msc.in :
|
||||
* glib/makefile.mingw.in :
|
||||
* tests/makefile.msc.in : reflect glib move
|
||||
|
||||
* tests/mainloop-test.c : #include <io.h> for _pipe()
|
||||
|
||||
* tests/gio-test.c : casts for strict compiler settings
|
||||
|
||||
* makefile.msc.in : new master makefile reflecting the glib
|
||||
move. The '.in' isn't really needed anymore, because there
|
||||
is no version number in it
|
||||
|
||||
2001-07-19 Darin Adler <darin@bentspoon.com>
|
||||
|
||||
* glib/gstrfuncs.c: (g_ascii_strdown), (g_ascii_strup): Add
|
||||
@ -109,6 +127,7 @@ Fri Jul 6 22:34:32 2001 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* configure.in: added Basque (eu) to ALL_LINGUAS
|
||||
|
||||
>>>>>>> 1.757
|
||||
Mon Jul 2 19:48:52 2001 Andrew Lanoix <alanoix@umich.edu>
|
||||
|
||||
*giowin32.c: g_source_remove()ing an socket iochannel closes
|
||||
|
||||
@ -1,3 +1,21 @@
|
||||
2001-07-20 Hans Breuer <hans@breuer.org>
|
||||
|
||||
* glib/glib/giowin32.c : make it compile again
|
||||
|
||||
* glib/glib.def : updated exports
|
||||
|
||||
* glib/makefile.msc.in :
|
||||
* glib/makefile.mingw.in :
|
||||
* tests/makefile.msc.in : reflect glib move
|
||||
|
||||
* tests/mainloop-test.c : #include <io.h> for _pipe()
|
||||
|
||||
* tests/gio-test.c : casts for strict compiler settings
|
||||
|
||||
* makefile.msc.in : new master makefile reflecting the glib
|
||||
move. The '.in' isn't really needed anymore, because there
|
||||
is no version number in it
|
||||
|
||||
2001-07-19 Darin Adler <darin@bentspoon.com>
|
||||
|
||||
* glib/gstrfuncs.c: (g_ascii_strdown), (g_ascii_strup): Add
|
||||
@ -109,6 +127,7 @@ Fri Jul 6 22:34:32 2001 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* configure.in: added Basque (eu) to ALL_LINGUAS
|
||||
|
||||
>>>>>>> 1.757
|
||||
Mon Jul 2 19:48:52 2001 Andrew Lanoix <alanoix@umich.edu>
|
||||
|
||||
*giowin32.c: g_source_remove()ing an socket iochannel closes
|
||||
|
||||
@ -1,3 +1,21 @@
|
||||
2001-07-20 Hans Breuer <hans@breuer.org>
|
||||
|
||||
* glib/glib/giowin32.c : make it compile again
|
||||
|
||||
* glib/glib.def : updated exports
|
||||
|
||||
* glib/makefile.msc.in :
|
||||
* glib/makefile.mingw.in :
|
||||
* tests/makefile.msc.in : reflect glib move
|
||||
|
||||
* tests/mainloop-test.c : #include <io.h> for _pipe()
|
||||
|
||||
* tests/gio-test.c : casts for strict compiler settings
|
||||
|
||||
* makefile.msc.in : new master makefile reflecting the glib
|
||||
move. The '.in' isn't really needed anymore, because there
|
||||
is no version number in it
|
||||
|
||||
2001-07-19 Darin Adler <darin@bentspoon.com>
|
||||
|
||||
* glib/gstrfuncs.c: (g_ascii_strdown), (g_ascii_strup): Add
|
||||
@ -109,6 +127,7 @@ Fri Jul 6 22:34:32 2001 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* configure.in: added Basque (eu) to ALL_LINGUAS
|
||||
|
||||
>>>>>>> 1.757
|
||||
Mon Jul 2 19:48:52 2001 Andrew Lanoix <alanoix@umich.edu>
|
||||
|
||||
*giowin32.c: g_source_remove()ing an socket iochannel closes
|
||||
|
||||
@ -1,3 +1,21 @@
|
||||
2001-07-20 Hans Breuer <hans@breuer.org>
|
||||
|
||||
* glib/glib/giowin32.c : make it compile again
|
||||
|
||||
* glib/glib.def : updated exports
|
||||
|
||||
* glib/makefile.msc.in :
|
||||
* glib/makefile.mingw.in :
|
||||
* tests/makefile.msc.in : reflect glib move
|
||||
|
||||
* tests/mainloop-test.c : #include <io.h> for _pipe()
|
||||
|
||||
* tests/gio-test.c : casts for strict compiler settings
|
||||
|
||||
* makefile.msc.in : new master makefile reflecting the glib
|
||||
move. The '.in' isn't really needed anymore, because there
|
||||
is no version number in it
|
||||
|
||||
2001-07-19 Darin Adler <darin@bentspoon.com>
|
||||
|
||||
* glib/gstrfuncs.c: (g_ascii_strdown), (g_ascii_strup): Add
|
||||
@ -109,6 +127,7 @@ Fri Jul 6 22:34:32 2001 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* configure.in: added Basque (eu) to ALL_LINGUAS
|
||||
|
||||
>>>>>>> 1.757
|
||||
Mon Jul 2 19:48:52 2001 Andrew Lanoix <alanoix@umich.edu>
|
||||
|
||||
*giowin32.c: g_source_remove()ing an socket iochannel closes
|
||||
|
||||
@ -1,3 +1,21 @@
|
||||
2001-07-20 Hans Breuer <hans@breuer.org>
|
||||
|
||||
* glib/glib/giowin32.c : make it compile again
|
||||
|
||||
* glib/glib.def : updated exports
|
||||
|
||||
* glib/makefile.msc.in :
|
||||
* glib/makefile.mingw.in :
|
||||
* tests/makefile.msc.in : reflect glib move
|
||||
|
||||
* tests/mainloop-test.c : #include <io.h> for _pipe()
|
||||
|
||||
* tests/gio-test.c : casts for strict compiler settings
|
||||
|
||||
* makefile.msc.in : new master makefile reflecting the glib
|
||||
move. The '.in' isn't really needed anymore, because there
|
||||
is no version number in it
|
||||
|
||||
2001-07-19 Darin Adler <darin@bentspoon.com>
|
||||
|
||||
* glib/gstrfuncs.c: (g_ascii_strdown), (g_ascii_strup): Add
|
||||
@ -109,6 +127,7 @@ Fri Jul 6 22:34:32 2001 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* configure.in: added Basque (eu) to ALL_LINGUAS
|
||||
|
||||
>>>>>>> 1.757
|
||||
Mon Jul 2 19:48:52 2001 Andrew Lanoix <alanoix@umich.edu>
|
||||
|
||||
*giowin32.c: g_source_remove()ing an socket iochannel closes
|
||||
|
||||
@ -1,3 +1,21 @@
|
||||
2001-07-20 Hans Breuer <hans@breuer.org>
|
||||
|
||||
* glib/glib/giowin32.c : make it compile again
|
||||
|
||||
* glib/glib.def : updated exports
|
||||
|
||||
* glib/makefile.msc.in :
|
||||
* glib/makefile.mingw.in :
|
||||
* tests/makefile.msc.in : reflect glib move
|
||||
|
||||
* tests/mainloop-test.c : #include <io.h> for _pipe()
|
||||
|
||||
* tests/gio-test.c : casts for strict compiler settings
|
||||
|
||||
* makefile.msc.in : new master makefile reflecting the glib
|
||||
move. The '.in' isn't really needed anymore, because there
|
||||
is no version number in it
|
||||
|
||||
2001-07-19 Darin Adler <darin@bentspoon.com>
|
||||
|
||||
* glib/gstrfuncs.c: (g_ascii_strdown), (g_ascii_strup): Add
|
||||
@ -109,6 +127,7 @@ Fri Jul 6 22:34:32 2001 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* configure.in: added Basque (eu) to ALL_LINGUAS
|
||||
|
||||
>>>>>>> 1.757
|
||||
Mon Jul 2 19:48:52 2001 Andrew Lanoix <alanoix@umich.edu>
|
||||
|
||||
*giowin32.c: g_source_remove()ing an socket iochannel closes
|
||||
|
||||
@ -1,3 +1,21 @@
|
||||
2001-07-20 Hans Breuer <hans@breuer.org>
|
||||
|
||||
* glib/glib/giowin32.c : make it compile again
|
||||
|
||||
* glib/glib.def : updated exports
|
||||
|
||||
* glib/makefile.msc.in :
|
||||
* glib/makefile.mingw.in :
|
||||
* tests/makefile.msc.in : reflect glib move
|
||||
|
||||
* tests/mainloop-test.c : #include <io.h> for _pipe()
|
||||
|
||||
* tests/gio-test.c : casts for strict compiler settings
|
||||
|
||||
* makefile.msc.in : new master makefile reflecting the glib
|
||||
move. The '.in' isn't really needed anymore, because there
|
||||
is no version number in it
|
||||
|
||||
2001-07-19 Darin Adler <darin@bentspoon.com>
|
||||
|
||||
* glib/gstrfuncs.c: (g_ascii_strdown), (g_ascii_strup): Add
|
||||
@ -109,6 +127,7 @@ Fri Jul 6 22:34:32 2001 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* configure.in: added Basque (eu) to ALL_LINGUAS
|
||||
|
||||
>>>>>>> 1.757
|
||||
Mon Jul 2 19:48:52 2001 Andrew Lanoix <alanoix@umich.edu>
|
||||
|
||||
*giowin32.c: g_source_remove()ing an socket iochannel closes
|
||||
|
||||
@ -1,3 +1,21 @@
|
||||
2001-07-20 Hans Breuer <hans@breuer.org>
|
||||
|
||||
* glib/glib/giowin32.c : make it compile again
|
||||
|
||||
* glib/glib.def : updated exports
|
||||
|
||||
* glib/makefile.msc.in :
|
||||
* glib/makefile.mingw.in :
|
||||
* tests/makefile.msc.in : reflect glib move
|
||||
|
||||
* tests/mainloop-test.c : #include <io.h> for _pipe()
|
||||
|
||||
* tests/gio-test.c : casts for strict compiler settings
|
||||
|
||||
* makefile.msc.in : new master makefile reflecting the glib
|
||||
move. The '.in' isn't really needed anymore, because there
|
||||
is no version number in it
|
||||
|
||||
2001-07-19 Darin Adler <darin@bentspoon.com>
|
||||
|
||||
* glib/gstrfuncs.c: (g_ascii_strdown), (g_ascii_strup): Add
|
||||
@ -109,6 +127,7 @@ Fri Jul 6 22:34:32 2001 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* configure.in: added Basque (eu) to ALL_LINGUAS
|
||||
|
||||
>>>>>>> 1.757
|
||||
Mon Jul 2 19:48:52 2001 Andrew Lanoix <alanoix@umich.edu>
|
||||
|
||||
*giowin32.c: g_source_remove()ing an socket iochannel closes
|
||||
|
||||
@ -952,8 +952,10 @@ g_io_win32_sock_read (GIOChannel *channel,
|
||||
break;
|
||||
case WSAEWOULDBLOCK:
|
||||
return G_IO_STATUS_AGAIN;
|
||||
#ifdef WE_NEED_TO_HANDLE_WSAEINTR /* not anymore with wsock2 ? */
|
||||
case WSAEINTR:
|
||||
return G_IO_STATUS_INTR;
|
||||
#endif
|
||||
default:
|
||||
error = G_IO_CHANNEL_ERROR_FAILED;
|
||||
break;
|
||||
@ -1001,8 +1003,10 @@ g_io_win32_sock_write (GIOChannel *channel,
|
||||
break;
|
||||
case WSAEWOULDBLOCK:
|
||||
return G_IO_STATUS_AGAIN;
|
||||
#ifdef WE_NEED_TO_HANDLE_WSAEINTR /* not anymore with wsock2 ? */
|
||||
case WSAEINTR:
|
||||
return G_IO_STATUS_INTR;
|
||||
#endif
|
||||
default:
|
||||
error = G_IO_CHANNEL_ERROR_FAILED;
|
||||
break;
|
||||
|
||||
@ -12,6 +12,10 @@ EXPORTS
|
||||
g_array_sized_new
|
||||
g_array_sort
|
||||
g_array_sort_with_data
|
||||
g_ascii_strcasecmp
|
||||
g_ascii_strncasecmp
|
||||
g_ascii_strdown
|
||||
g_ascii_strup
|
||||
g_async_queue_length
|
||||
g_async_queue_length_unlocked
|
||||
g_async_queue_lock
|
||||
@ -233,6 +237,7 @@ EXPORTS
|
||||
g_list_free_1
|
||||
g_list_index
|
||||
g_list_insert
|
||||
g_list_insert_before
|
||||
g_list_insert_sorted
|
||||
g_list_last
|
||||
g_list_length
|
||||
@ -263,7 +268,7 @@ EXPORTS
|
||||
g_main_context_find_source_by_funcs_user_data
|
||||
g_main_context_find_source_by_id
|
||||
g_main_context_find_source_by_user_data
|
||||
g_main_context_get
|
||||
g_main_context_new
|
||||
g_main_context_get_poll_func
|
||||
g_main_context_iteration
|
||||
g_main_context_pending
|
||||
@ -438,6 +443,7 @@ EXPORTS
|
||||
g_slist_free_1
|
||||
g_slist_index
|
||||
g_slist_insert
|
||||
g_slist_insert_before
|
||||
g_slist_insert_sorted
|
||||
g_slist_last
|
||||
g_slist_length
|
||||
@ -516,6 +522,7 @@ EXPORTS
|
||||
g_string_append
|
||||
g_string_append_c
|
||||
g_string_append_len
|
||||
g_string_append_unichar
|
||||
g_string_assign
|
||||
g_string_chunk_free
|
||||
g_string_chunk_insert
|
||||
@ -528,11 +535,13 @@ EXPORTS
|
||||
g_string_insert
|
||||
g_string_insert_c
|
||||
g_string_insert_len
|
||||
g_string_insert_unichar
|
||||
g_string_new
|
||||
g_string_new_len
|
||||
g_string_prepend
|
||||
g_string_prepend_c
|
||||
g_string_prepend_len
|
||||
g_string_prepend_unichar
|
||||
g_string_printf
|
||||
g_string_printfa
|
||||
g_string_sized_new
|
||||
@ -618,16 +627,22 @@ EXPORTS
|
||||
g_usleep
|
||||
g_utf16_to_ucs4
|
||||
g_utf16_to_utf8
|
||||
g_utf8_casefold
|
||||
g_utf8_collate
|
||||
g_utf8_collate_key
|
||||
g_utf8_find_next_char
|
||||
g_utf8_find_prev_char
|
||||
g_utf8_get_char
|
||||
g_utf8_get_char_validated
|
||||
g_utf8_offset_to_pointer
|
||||
g_utf8_pointer_to_offset
|
||||
g_utf8_prev_char
|
||||
g_utf8_skip
|
||||
g_utf8_strchr
|
||||
g_utf8_strdown
|
||||
g_utf8_strlen
|
||||
g_utf8_strncpy
|
||||
g_utf8_strup
|
||||
g_utf8_to_ucs4
|
||||
g_utf8_to_ucs4_fast
|
||||
g_utf8_to_utf16
|
||||
|
||||
@ -3,9 +3,9 @@
|
||||
|
||||
## Use: make -f makefile.mingw
|
||||
|
||||
TOP = ..
|
||||
TOP = ../..
|
||||
|
||||
include build/win32/make.mingw
|
||||
include $(TOP)/build/win32/make.mingw
|
||||
|
||||
# Possibly override GLib version in build/win32/module.defs
|
||||
GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
|
||||
@ -14,24 +14,15 @@ GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
|
||||
|
||||
# Nothing much configurable below
|
||||
|
||||
INCLUDES = -I .
|
||||
INCLUDES = -I . -I ..
|
||||
DEFINES = -DHAVE_CONFIG_H -DGLIB_COMPILATION -DG_LOG_DOMAIN=g_log_domain_glib -DG_ENABLE_DEBUG -DDLL_EXPORT
|
||||
DEPCFLAGS = $(INTL_CFLAGS) $(LIBICONV_CFLAGS)
|
||||
|
||||
DLLS_TO_BUILD = \
|
||||
glib-$(GLIB_VER).dll \
|
||||
sub-gmodule \
|
||||
sub-gthread \
|
||||
sub-gobject
|
||||
|
||||
all : \
|
||||
config.h \
|
||||
glibconfig.h \
|
||||
$(DLLS_TO_BUILD) \
|
||||
gspawn-win32-helper.exe \
|
||||
testglib.exe \
|
||||
testgdate.exe \
|
||||
testgdateparser.exe
|
||||
../config.h \
|
||||
../glibconfig.h \
|
||||
glib-$(GLIB_VER).dll \
|
||||
gspawn-win32-helper.exe
|
||||
|
||||
glib_OBJECTS = \
|
||||
garray.o \
|
||||
@ -71,16 +62,17 @@ glib_OBJECTS = \
|
||||
gtimer.o \
|
||||
gtree.o \
|
||||
gunibreak.o \
|
||||
gunicollate.o \
|
||||
gunidecomp.o \
|
||||
guniprop.o \
|
||||
gutf8.o \
|
||||
gutils.o \
|
||||
gwin32.o
|
||||
|
||||
glibconfig.h: glibconfig.h.win32
|
||||
../glibconfig.h: ../glibconfig.h.win32
|
||||
cp $< $@
|
||||
|
||||
config.h: config.h.win32
|
||||
../config.h: ../config.h.win32
|
||||
cp $< $@
|
||||
|
||||
ifeq ($(wildcard makefile.mingw.in),makefile.mingw.in)
|
||||
@ -91,8 +83,11 @@ endif
|
||||
|
||||
################ glib
|
||||
|
||||
#glib-$(GLIB_VER).dll : $(glib_OBJECTS) glib.def
|
||||
# ./build-dll glib $(GLIB_VER) glib.def $(glib_OBJECTS) $(INTL_LIBS) $(LIBICONV_LIBS) -luser32 -lwsock32
|
||||
|
||||
glib-$(GLIB_VER).dll : $(glib_OBJECTS) glib.def
|
||||
./build-dll glib $(GLIB_VER) glib.def $(glib_OBJECTS) $(INTL_LIBS) $(LIBICONV_LIBS) -luser32 -lwsock32
|
||||
dllwrap --mno-cygwin --dllname glib-$(GLIB_VER).dll --implib glib-$(GLIB_VER).lib --def glib.def $(glib_OBJECTS) $(INTL_LIBS) $(LIBICONV_LIBS) -luser32 -lwsock32
|
||||
|
||||
gspawn-win32-helper.exe : gspawn-win32-helper.c
|
||||
$(CC) $(CFLAGS) -mwindows -DG_LOG_DOMAIN=\"gspawn-win32-helper\" -o $@ $< -L . -lglib-$(GLIB_VER)
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
## Makefile for building the GLib dlls with Microsoft C
|
||||
## Use: nmake -f makefile.msc
|
||||
|
||||
TOP = ..
|
||||
TOP = ..\..
|
||||
|
||||
!INCLUDE $(TOP)\build\win32\make.msc
|
||||
|
||||
@ -12,25 +12,16 @@ GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
|
||||
|
||||
# Nothing much configurable below
|
||||
|
||||
INCLUDES = -I .
|
||||
INCLUDES = -I . -I ..
|
||||
DEFINES = -DHAVE_CONFIG_H -DGLIB_COMPILATION -DG_LOG_DOMAIN=g_log_domain_glib -DG_ENABLE_DEBUG
|
||||
DEPCFLAGS = $(INTL_CFLAGS) $(LIBICONV_CFLAGS)
|
||||
|
||||
DLLS_TO_BUILD = \
|
||||
glib-$(GLIB_VER).dll \
|
||||
sub-gmodule \
|
||||
sub-gthread \
|
||||
sub-gobject
|
||||
|
||||
all : \
|
||||
config.h \
|
||||
glibconfig.h \
|
||||
..\config.h \
|
||||
..\glibconfig.h \
|
||||
glib-$(GLIB_VER).dll \
|
||||
glib-$(GLIB_VER)s.lib \
|
||||
$(DLLS_TO_BUILD) \
|
||||
gspawn-win32-helper.exe \
|
||||
testglib.exe \
|
||||
testgdate.exe \
|
||||
testgdateparser.exe
|
||||
|
||||
glib_OBJECTS = \
|
||||
garray.obj \
|
||||
@ -70,17 +61,18 @@ glib_OBJECTS = \
|
||||
gtimer.obj \
|
||||
gtree.obj \
|
||||
gunibreak.obj \
|
||||
gunicollate.obj \
|
||||
gunidecomp.obj \
|
||||
guniprop.obj \
|
||||
gutf8.obj \
|
||||
gutils.obj \
|
||||
gwin32.obj
|
||||
|
||||
glibconfig.h: glibconfig.h.win32
|
||||
copy glibconfig.h.win32 glibconfig.h
|
||||
..\glibconfig.h: ..\glibconfig.h.win32
|
||||
copy ..\glibconfig.h.win32 ..\glibconfig.h
|
||||
|
||||
config.h: config.h.win32
|
||||
copy config.h.win32 config.h
|
||||
..\config.h: ..\config.h.win32
|
||||
copy ..\config.h.win32 ..\config.h
|
||||
|
||||
makefile.msc: makefile.msc.in
|
||||
$(SED) -e s,@GLIB[_]MAJOR_VERSION@,@GLIB_MAJOR_VERSION@, \
|
||||
@ -92,62 +84,14 @@ makefile.msc: makefile.msc.in
|
||||
glib-$(GLIB_VER)s.lib : $(glib_OBJECTS)
|
||||
lib /out:glib-$(GLIB_VER)s.lib $(glib_OBJECTS)
|
||||
|
||||
# $(LIBICONV_LIBS) is a runtime dependency now
|
||||
|
||||
glib-$(GLIB_VER).dll : $(glib_OBJECTS) glib.def
|
||||
$(CC) $(CFLAGS) -LD -Feglib-$(GLIB_VER).dll $(glib_OBJECTS) $(INTL_LIBS) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:glib.def
|
||||
$(CC) $(CFLAGS) -LD -Feglib-$(GLIB_VER).dll $(glib_OBJECTS) $(LIBICONV_LIBS) $(INTL_LIBS) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:glib.def
|
||||
|
||||
gspawn-win32-helper.exe : gspawn-win32-helper.c glib-$(GLIB_VER).dll
|
||||
$(CC) $(CFLAGS) -Fe$@ -DG_LOG_DOMAIN=\"gspawn-win32-helper\" gspawn-win32-helper.c glib-$(GLIB_VER).lib $(LDFLAGS) /subsystem:windows user32.lib
|
||||
|
||||
################ subdirectories
|
||||
|
||||
sub-gmodule :
|
||||
cd gmodule
|
||||
-$(MAKE) -f makefile.msc all
|
||||
cd ..
|
||||
|
||||
sub-gthread :
|
||||
cd gthread
|
||||
-$(MAKE) -f makefile.msc all
|
||||
cd ..
|
||||
|
||||
sub-gobject :
|
||||
cd gobject
|
||||
-$(MAKE) -f makefile.msc all
|
||||
cd ..
|
||||
|
||||
################ test progs
|
||||
|
||||
testglib.obj : testglib.c
|
||||
$(CC) -c $(CFLAGS) -DG_LOG_DOMAIN=\"testglib\" testglib.c
|
||||
|
||||
testglib.exe : glib-$(GLIB_VER).dll testglib.obj
|
||||
$(CC) $(CFLAGS) -Fetestglib.exe testglib.obj glib-$(GLIB_VER).lib $(LDFLAGS) /subsystem:console
|
||||
|
||||
testgdate.obj : testgdate.c
|
||||
$(CC) -c $(CFLAGS) -DG_LOG_DOMAIN=\"testgdate\" testgdate.c
|
||||
|
||||
testgdate.exe : glib-$(GLIB_VER).dll testgdate.obj
|
||||
$(CC) $(CFLAGS) -Fetestgdate.exe testgdate.obj glib-$(GLIB_VER).lib $(LDFLAGS) /subsystem:console
|
||||
|
||||
testgdateparser.obj : testgdateparser.c
|
||||
$(CC) -c $(CFLAGS) -DG_LOG_DOMAIN=\"testgdateparser\" testgdateparser.c
|
||||
|
||||
testgdateparser.exe : glib-$(GLIB_VER).dll testgdateparser.obj
|
||||
$(CC) $(CFLAGS) -Fetestgdateparser.exe testgdateparser.obj glib-$(GLIB_VER).lib $(LDFLAGS) /subsystem:console
|
||||
|
||||
################ other stuff
|
||||
|
||||
clean::
|
||||
del config.h
|
||||
del ..\config.h
|
||||
del glibconfig.h
|
||||
cd gmodule
|
||||
$(MAKE) -f makefile.msc clean
|
||||
cd ..
|
||||
cd gthread
|
||||
$(MAKE) -f makefile.msc clean
|
||||
cd ..
|
||||
cd gobject
|
||||
$(MAKE) -f makefile.msc clean
|
||||
cd ..
|
||||
|
||||
151
makefile.msc.in
151
makefile.msc.in
@ -5,149 +5,22 @@ TOP = ..
|
||||
|
||||
!INCLUDE $(TOP)\build\win32\make.msc
|
||||
|
||||
# Possibly override GLib version in build\win32\module.defs
|
||||
GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
|
||||
PARTS = glib gmodule gthread gobject tests
|
||||
|
||||
################################################################
|
||||
all : \
|
||||
config.h \
|
||||
sub-all
|
||||
|
||||
# Nothing much configurable below
|
||||
sub-all:
|
||||
for %d in ($(PARTS)) do nmake -nologo -f makefile.msc sub-one THIS=%d
|
||||
|
||||
INCLUDES = -I .
|
||||
DEFINES = -DHAVE_CONFIG_H -DGLIB_COMPILATION -DG_LOG_DOMAIN=g_log_domain_glib -DG_ENABLE_DEBUG
|
||||
DEPCFLAGS = $(INTL_CFLAGS) $(LIBICONV_CFLAGS)
|
||||
|
||||
DLLS_TO_BUILD = \
|
||||
glib-$(GLIB_VER).dll \
|
||||
sub-gmodule \
|
||||
sub-gthread \
|
||||
sub-gobject
|
||||
|
||||
all : \
|
||||
config.h \
|
||||
glibconfig.h \
|
||||
glib-$(GLIB_VER)s.lib \
|
||||
$(DLLS_TO_BUILD) \
|
||||
gspawn-win32-helper.exe \
|
||||
testglib.exe \
|
||||
testgdate.exe \
|
||||
testgdateparser.exe
|
||||
|
||||
glib_OBJECTS = \
|
||||
garray.obj \
|
||||
gasyncqueue.obj \
|
||||
gbacktrace.obj \
|
||||
gcache.obj \
|
||||
gcompletion.obj \
|
||||
gconvert.obj \
|
||||
gdataset.obj \
|
||||
gdate.obj \
|
||||
gerror.obj \
|
||||
gfileutils.obj \
|
||||
ghash.obj \
|
||||
ghook.obj \
|
||||
giochannel.obj \
|
||||
giowin32.obj \
|
||||
glist.obj \
|
||||
gmain.obj \
|
||||
gmarkup.obj \
|
||||
gmem.obj \
|
||||
gmessages.obj \
|
||||
gnode.obj \
|
||||
gprimes.obj \
|
||||
gqsort.obj \
|
||||
gqueue.obj \
|
||||
gpattern.obj \
|
||||
grand.obj \
|
||||
grel.obj \
|
||||
gscanner.obj \
|
||||
gshell.obj \
|
||||
gslist.obj \
|
||||
gspawn-win32.obj \
|
||||
gstrfuncs.obj \
|
||||
gstring.obj \
|
||||
gthread.obj \
|
||||
gthreadpool.obj \
|
||||
gtimer.obj \
|
||||
gtree.obj \
|
||||
gunibreak.obj \
|
||||
gunidecomp.obj \
|
||||
guniprop.obj \
|
||||
gutf8.obj \
|
||||
gutils.obj \
|
||||
gwin32.obj
|
||||
|
||||
glibconfig.h: glibconfig.h.win32
|
||||
copy glibconfig.h.win32 glibconfig.h
|
||||
sub-one:
|
||||
@cd $(THIS)
|
||||
@nmake -nologo -f makefile.msc
|
||||
@cd ..
|
||||
|
||||
config.h: config.h.win32
|
||||
copy config.h.win32 config.h
|
||||
|
||||
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 >$@
|
||||
|
||||
################ glib
|
||||
|
||||
# create a static libary
|
||||
glib-$(GLIB_VER)s.lib : $(glib_OBJECTS)
|
||||
lib /out:glib-$(GLIB_VER)s.lib $(glib_OBJECTS)
|
||||
|
||||
# $(LIBICONV_LIBS) is a runtime dependency now
|
||||
|
||||
glib-$(GLIB_VER).dll : $(glib_OBJECTS) glib.def
|
||||
$(CC) $(CFLAGS) -LD -Feglib-$(GLIB_VER).dll $(glib_OBJECTS) $(INTL_LIBS) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:glib.def
|
||||
|
||||
gspawn-win32-helper.exe : gspawn-win32-helper.c glib-$(GLIB_VER).dll
|
||||
$(CC) $(CFLAGS) -Fe$@ -DG_LOG_DOMAIN=\"gspawn-win32-helper\" gspawn-win32-helper.c glib-$(GLIB_VER).lib $(LDFLAGS) /subsystem:windows user32.lib
|
||||
|
||||
################ subdirectories
|
||||
|
||||
sub-gmodule :
|
||||
cd gmodule
|
||||
-$(MAKE) -f makefile.msc all
|
||||
cd ..
|
||||
|
||||
sub-gthread :
|
||||
cd gthread
|
||||
-$(MAKE) -f makefile.msc all
|
||||
cd ..
|
||||
|
||||
sub-gobject :
|
||||
cd gobject
|
||||
-$(MAKE) -f makefile.msc all
|
||||
cd ..
|
||||
|
||||
################ test progs
|
||||
|
||||
testglib.obj : testglib.c
|
||||
$(CC) -c $(CFLAGS) -DG_LOG_DOMAIN=\"testglib\" testglib.c
|
||||
|
||||
testglib.exe : glib-$(GLIB_VER).dll testglib.obj
|
||||
$(CC) $(CFLAGS) -Fetestglib.exe testglib.obj glib-$(GLIB_VER).lib $(LDFLAGS) /subsystem:console
|
||||
|
||||
testgdate.obj : testgdate.c
|
||||
$(CC) -c $(CFLAGS) -DG_LOG_DOMAIN=\"testgdate\" testgdate.c
|
||||
|
||||
testgdate.exe : glib-$(GLIB_VER).dll testgdate.obj
|
||||
$(CC) $(CFLAGS) -Fetestgdate.exe testgdate.obj glib-$(GLIB_VER).lib $(LDFLAGS) /subsystem:console
|
||||
|
||||
testgdateparser.obj : testgdateparser.c
|
||||
$(CC) -c $(CFLAGS) -DG_LOG_DOMAIN=\"testgdateparser\" testgdateparser.c
|
||||
|
||||
testgdateparser.exe : glib-$(GLIB_VER).dll testgdateparser.obj
|
||||
$(CC) $(CFLAGS) -Fetestgdateparser.exe testgdateparser.obj glib-$(GLIB_VER).lib $(LDFLAGS) /subsystem:console
|
||||
|
||||
################ other stuff
|
||||
|
||||
clean::
|
||||
del config.h
|
||||
del glibconfig.h
|
||||
cd gmodule
|
||||
$(MAKE) -f makefile.msc clean
|
||||
cd ..
|
||||
cd gthread
|
||||
$(MAKE) -f makefile.msc clean
|
||||
cd ..
|
||||
cd gobject
|
||||
$(MAKE) -f makefile.msc clean
|
||||
cd ..
|
||||
glibconfig.h: glibconfig.h.win32
|
||||
copy glibconfig.h.win32 glibconfig.h
|
||||
|
||||
@ -301,7 +301,7 @@ main (int argc,
|
||||
exit (1);
|
||||
}
|
||||
|
||||
hwnd = CreateWindow (klass, "gio-test", 0, 0, 0, 10, 10,
|
||||
hwnd = CreateWindow (MAKEINTATOM(klass), "gio-test", 0, 0, 0, 10, 10,
|
||||
NULL, NULL, wcl.hInstance, NULL);
|
||||
if (!hwnd)
|
||||
{
|
||||
@ -309,7 +309,7 @@ main (int argc,
|
||||
exit (1);
|
||||
}
|
||||
|
||||
windows_messages_channel = g_io_channel_win32_new_messages (hwnd);
|
||||
windows_messages_channel = g_io_channel_win32_new_messages ((guint)hwnd);
|
||||
g_io_add_watch (windows_messages_channel, G_IO_IN, recv_windows_message, 0);
|
||||
#endif
|
||||
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
|
||||
#ifdef G_OS_WIN32
|
||||
#include <fcntl.h> /* For _O_BINARY used by pipe() macro */
|
||||
#include <io.h> /* for _pipe() */
|
||||
#endif
|
||||
|
||||
#define ITERS 10000
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
TOP = ..\..
|
||||
|
||||
!INCLUDE ..\build\win32\make.msc
|
||||
!INCLUDE $(TOP)\build\win32\make.msc
|
||||
|
||||
# Possibly override GLib version in build\win32\module.defs
|
||||
GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
|
||||
@ -12,10 +12,13 @@ GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
|
||||
|
||||
# Nothing much configurable below
|
||||
|
||||
INCLUDES = -I .. -I ../gmodule
|
||||
INCLUDES = -I .. -I ..\glib -I ..\gmodule
|
||||
DEFINES = -DHAVE_CONFIG_H
|
||||
|
||||
TESTS = \
|
||||
testglib.exe \
|
||||
testgdate.exe \
|
||||
testgdateparser.exe \
|
||||
array-test.exe \
|
||||
date-test.exe \
|
||||
dirname-test.exe\
|
||||
@ -51,13 +54,13 @@ makefile.msc: makefile.msc.in
|
||||
|
||||
.c.exe :
|
||||
$(CC) $(CFLAGS) -c $<
|
||||
$(CC) $(CFLAGS) -Fe$@ $< ..\glib-$(GLIB_VER).lib ..\gmodule\gmodule-$(GLIB_VER).lib ..\gthread\gthread-$(GLIB_VER).lib $(LDFLAGS) /subsystem:console
|
||||
$(CC) $(CFLAGS) -Fe$@ $< ..\glib\glib-$(GLIB_VER).lib ..\gmodule\gmodule-$(GLIB_VER).lib ..\gthread\gthread-$(GLIB_VER).lib $(LDFLAGS) user32.lib /subsystem:console
|
||||
|
||||
libmoduletestplugin_a.dll : libmoduletestplugin_a.obj
|
||||
$(CC) $(CFLAGS) -LD libmoduletestplugin_a.obj ..\gmodule\gmodule-$(GLIB_VER).lib ..\glib-$(GLIB_VER).lib $(LDFLAGS)
|
||||
$(CC) $(CFLAGS) -LD libmoduletestplugin_a.obj ..\gmodule\gmodule-$(GLIB_VER).lib ..\glib\glib-$(GLIB_VER).lib $(LDFLAGS)
|
||||
|
||||
libmoduletestplugin_b.dll : libmoduletestplugin_b.obj
|
||||
$(CC) $(CFLAGS) -LD libmoduletestplugin_b.obj ..\gmodule\gmodule-$(GLIB_VER).lib ..\glib-$(GLIB_VER).lib $(LDFLAGS)
|
||||
$(CC) $(CFLAGS) -LD libmoduletestplugin_b.obj ..\gmodule\gmodule-$(GLIB_VER).lib ..\glib\glib-$(GLIB_VER).lib $(LDFLAGS)
|
||||
|
||||
check: all
|
||||
for %p in ($(TESTS)) do %p
|
||||
|
||||
Loading…
Reference in New Issue
Block a user