luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-11 15:06:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revamp to be like makefile.mingw.in, make the MSVC build actually work

Browse Source 
2000-10-06  Tor Lillqvist  <tml@iki.fi>

	* makefile.msc.in: Revamp to be like makefile.mingw.in, make
	the MSVC build actually work again.

	* gmodule/makefile.msc.in
	* gobject/makefile.msc.in
	* gthread/makefile.msc.in: New files, like their mingw counterparts.

	* gmodule/Makefile.am
	* gobject/Makefile.am
	* gthread/Makefile.am: Make and distribute them.

	* */makefile.mingw.in: Allow override of GLib version number from
	the build/win32/module.defs file.

	* glib.def: Add new entry point.

	Fixes from Hans Breuer:

	* glib.h (struct DIR): Keep the last readdir result cached inside
	the DIR struct, to enable several DIRs being open simultaneously.

	* gwin32.c (g_win32_readdir): Use the above instead of static.

	* giowin32.c (g_io_channel_win32_make_pollfd): Insert cast to keep
	MSVC happy.
This commit is contained in:
Tor Lillqvist 2000-10-06 21:32:59 +00:00 committed by Tor Lillqvist
parent 0c6a1ee531
commit 8e847255e8
30 changed files with 527 additions and 243 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ChangeLog
View File

@ -1,3 +1,31 @@
2000-10-06 Tor Lillqvist <tml@iki.fi>
* makefile.msc.in: Revamp to be like makefile.mingw.in, make
the MSVC build actually work again.
* gmodule/makefile.msc.in
* gobject/makefile.msc.in
* gthread/makefile.msc.in: New files, like their mingw counterparts.
* gmodule/Makefile.am
* gobject/Makefile.am
* gthread/Makefile.am: Make and distribute them.
* */makefile.mingw.in: Allow override of GLib version number from
the build/win32/module.defs file.
* glib.def: Add new entry point.
Fixes from Hans Breuer:
* glib.h (struct DIR): Keep the last readdir result cached inside
the DIR struct, to enable several DIRs being open simultaneously.
* gwin32.c (g_win32_readdir): Use the above instead of static.
* giowin32.c (g_io_channel_win32_make_pollfd): Insert cast to keep
MSVC happy.
2000-10-05 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2000-10-05 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib.h: Changed alloca stuff a bit: when we have a working * glib.h: Changed alloca stuff a bit: when we have a working

28
ChangeLog.pre-2-0
View File

@ -1,3 +1,31 @@
2000-10-06 Tor Lillqvist <tml@iki.fi>
* makefile.msc.in: Revamp to be like makefile.mingw.in, make
the MSVC build actually work again.
* gmodule/makefile.msc.in
* gobject/makefile.msc.in
* gthread/makefile.msc.in: New files, like their mingw counterparts.
* gmodule/Makefile.am
* gobject/Makefile.am
* gthread/Makefile.am: Make and distribute them.
* */makefile.mingw.in: Allow override of GLib version number from
the build/win32/module.defs file.
* glib.def: Add new entry point.
Fixes from Hans Breuer:
* glib.h (struct DIR): Keep the last readdir result cached inside
the DIR struct, to enable several DIRs being open simultaneously.
* gwin32.c (g_win32_readdir): Use the above instead of static.
* giowin32.c (g_io_channel_win32_make_pollfd): Insert cast to keep
MSVC happy.
2000-10-05 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2000-10-05 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib.h: Changed alloca stuff a bit: when we have a working * glib.h: Changed alloca stuff a bit: when we have a working

28
ChangeLog.pre-2-10
View File

@ -1,3 +1,31 @@
2000-10-06 Tor Lillqvist <tml@iki.fi>
* makefile.msc.in: Revamp to be like makefile.mingw.in, make
the MSVC build actually work again.
* gmodule/makefile.msc.in
* gobject/makefile.msc.in
* gthread/makefile.msc.in: New files, like their mingw counterparts.
* gmodule/Makefile.am
* gobject/Makefile.am
* gthread/Makefile.am: Make and distribute them.
* */makefile.mingw.in: Allow override of GLib version number from
the build/win32/module.defs file.
* glib.def: Add new entry point.
Fixes from Hans Breuer:
* glib.h (struct DIR): Keep the last readdir result cached inside
the DIR struct, to enable several DIRs being open simultaneously.
* gwin32.c (g_win32_readdir): Use the above instead of static.
* giowin32.c (g_io_channel_win32_make_pollfd): Insert cast to keep
MSVC happy.
2000-10-05 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2000-10-05 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib.h: Changed alloca stuff a bit: when we have a working * glib.h: Changed alloca stuff a bit: when we have a working

28
ChangeLog.pre-2-12
View File

@ -1,3 +1,31 @@
2000-10-06 Tor Lillqvist <tml@iki.fi>
* makefile.msc.in: Revamp to be like makefile.mingw.in, make
the MSVC build actually work again.
* gmodule/makefile.msc.in
* gobject/makefile.msc.in
* gthread/makefile.msc.in: New files, like their mingw counterparts.
* gmodule/Makefile.am
* gobject/Makefile.am
* gthread/Makefile.am: Make and distribute them.
* */makefile.mingw.in: Allow override of GLib version number from
the build/win32/module.defs file.
* glib.def: Add new entry point.
Fixes from Hans Breuer:
* glib.h (struct DIR): Keep the last readdir result cached inside
the DIR struct, to enable several DIRs being open simultaneously.
* gwin32.c (g_win32_readdir): Use the above instead of static.
* giowin32.c (g_io_channel_win32_make_pollfd): Insert cast to keep
MSVC happy.
2000-10-05 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2000-10-05 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib.h: Changed alloca stuff a bit: when we have a working * glib.h: Changed alloca stuff a bit: when we have a working

28
ChangeLog.pre-2-2
View File

@ -1,3 +1,31 @@
2000-10-06 Tor Lillqvist <tml@iki.fi>
* makefile.msc.in: Revamp to be like makefile.mingw.in, make
the MSVC build actually work again.
* gmodule/makefile.msc.in
* gobject/makefile.msc.in
* gthread/makefile.msc.in: New files, like their mingw counterparts.
* gmodule/Makefile.am
* gobject/Makefile.am
* gthread/Makefile.am: Make and distribute them.
* */makefile.mingw.in: Allow override of GLib version number from
the build/win32/module.defs file.
* glib.def: Add new entry point.
Fixes from Hans Breuer:
* glib.h (struct DIR): Keep the last readdir result cached inside
the DIR struct, to enable several DIRs being open simultaneously.
* gwin32.c (g_win32_readdir): Use the above instead of static.
* giowin32.c (g_io_channel_win32_make_pollfd): Insert cast to keep
MSVC happy.
2000-10-05 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2000-10-05 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib.h: Changed alloca stuff a bit: when we have a working * glib.h: Changed alloca stuff a bit: when we have a working

28
ChangeLog.pre-2-4
View File

@ -1,3 +1,31 @@
2000-10-06 Tor Lillqvist <tml@iki.fi>
* makefile.msc.in: Revamp to be like makefile.mingw.in, make
the MSVC build actually work again.
* gmodule/makefile.msc.in
* gobject/makefile.msc.in
* gthread/makefile.msc.in: New files, like their mingw counterparts.
* gmodule/Makefile.am
* gobject/Makefile.am
* gthread/Makefile.am: Make and distribute them.
* */makefile.mingw.in: Allow override of GLib version number from
the build/win32/module.defs file.
* glib.def: Add new entry point.
Fixes from Hans Breuer:
* glib.h (struct DIR): Keep the last readdir result cached inside
the DIR struct, to enable several DIRs being open simultaneously.
* gwin32.c (g_win32_readdir): Use the above instead of static.
* giowin32.c (g_io_channel_win32_make_pollfd): Insert cast to keep
MSVC happy.
2000-10-05 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2000-10-05 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib.h: Changed alloca stuff a bit: when we have a working * glib.h: Changed alloca stuff a bit: when we have a working

28
ChangeLog.pre-2-6
View File

@ -1,3 +1,31 @@
2000-10-06 Tor Lillqvist <tml@iki.fi>
* makefile.msc.in: Revamp to be like makefile.mingw.in, make
the MSVC build actually work again.
* gmodule/makefile.msc.in
* gobject/makefile.msc.in
* gthread/makefile.msc.in: New files, like their mingw counterparts.
* gmodule/Makefile.am
* gobject/Makefile.am
* gthread/Makefile.am: Make and distribute them.
* */makefile.mingw.in: Allow override of GLib version number from
the build/win32/module.defs file.
* glib.def: Add new entry point.
Fixes from Hans Breuer:
* glib.h (struct DIR): Keep the last readdir result cached inside
the DIR struct, to enable several DIRs being open simultaneously.
* gwin32.c (g_win32_readdir): Use the above instead of static.
* giowin32.c (g_io_channel_win32_make_pollfd): Insert cast to keep
MSVC happy.
2000-10-05 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2000-10-05 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib.h: Changed alloca stuff a bit: when we have a working * glib.h: Changed alloca stuff a bit: when we have a working

28
ChangeLog.pre-2-8
View File

@ -1,3 +1,31 @@
2000-10-06 Tor Lillqvist <tml@iki.fi>
* makefile.msc.in: Revamp to be like makefile.mingw.in, make
the MSVC build actually work again.
* gmodule/makefile.msc.in
* gobject/makefile.msc.in
* gthread/makefile.msc.in: New files, like their mingw counterparts.
* gmodule/Makefile.am
* gobject/Makefile.am
* gthread/Makefile.am: Make and distribute them.
* */makefile.mingw.in: Allow override of GLib version number from
the build/win32/module.defs file.
* glib.def: Add new entry point.
Fixes from Hans Breuer:
* glib.h (struct DIR): Keep the last readdir result cached inside
the DIR struct, to enable several DIRs being open simultaneously.
* gwin32.c (g_win32_readdir): Use the above instead of static.
* giowin32.c (g_io_channel_win32_make_pollfd): Insert cast to keep
MSVC happy.
2000-10-05 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2000-10-05 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* glib.h: Changed alloca stuff a bit: when we have a working * glib.h: Changed alloca stuff a bit: when we have a working

2
giowin32.c
View File

@ -897,7 +897,7 @@ g_io_channel_win32_make_pollfd (GIOChannel *channel,
if (win32_channel->data_avail_event == NULL) if (win32_channel->data_avail_event == NULL)
create_events (win32_channel); create_events (win32_channel);
fd->fd = win32_channel->data_avail_event; fd->fd = (gint) win32_channel->data_avail_event;
fd->events = condition; fd->events = condition;
if (win32_channel->thread_id == 0) if (win32_channel->thread_id == 0)

1
glib.def
View File

@ -244,6 +244,7 @@ EXPORTS
g_node_first_sibling g_node_first_sibling
g_node_get_root g_node_get_root
g_node_insert g_node_insert
g_node_insert_after
g_node_insert_before g_node_insert_before
g_node_is_ancestor g_node_is_ancestor
g_node_last_child g_node_last_child

19
glib.h
View File

@ -3027,18 +3027,21 @@ typedef int pid_t;
# define closedir g_win32_closedir # define closedir g_win32_closedir
# define NAME_MAX 255 # define NAME_MAX 255
struct DIR
{
gchar *dir_name;
gboolean just_opened;
guint find_file_handle;
gpointer find_file_data;
};
typedef struct DIR DIR;
struct dirent struct dirent
{ {
gchar d_name[NAME_MAX + 1]; gchar d_name[NAME_MAX + 1];
}; };
struct DIR
{
gchar *dir_name;
gboolean just_opened;
guint find_file_handle;
gpointer find_file_data;
struct dirent readdir_result;
};
typedef struct DIR DIR;
/* emulation functions */ /* emulation functions */
extern int g_win32_ftruncate (gint f, extern int g_win32_ftruncate (gint f,
guint size); guint size);

2
glib/giowin32.c
View File

@ -897,7 +897,7 @@ g_io_channel_win32_make_pollfd (GIOChannel *channel,
if (win32_channel->data_avail_event == NULL) if (win32_channel->data_avail_event == NULL)
create_events (win32_channel); create_events (win32_channel);
fd->fd = win32_channel->data_avail_event; fd->fd = (gint) win32_channel->data_avail_event;
fd->events = condition; fd->events = condition;
if (win32_channel->thread_id == 0) if (win32_channel->thread_id == 0)

1
glib/glib.def
View File

@ -244,6 +244,7 @@ EXPORTS
g_node_first_sibling g_node_first_sibling
g_node_get_root g_node_get_root
g_node_insert g_node_insert
g_node_insert_after
g_node_insert_before g_node_insert_before
g_node_is_ancestor g_node_is_ancestor
g_node_last_child g_node_last_child

19
glib/glib.h
View File

@ -3027,18 +3027,21 @@ typedef int pid_t;
# define closedir g_win32_closedir # define closedir g_win32_closedir
# define NAME_MAX 255 # define NAME_MAX 255
struct DIR
{
gchar *dir_name;
gboolean just_opened;
guint find_file_handle;
gpointer find_file_data;
};
typedef struct DIR DIR;
struct dirent struct dirent
{ {
gchar d_name[NAME_MAX + 1]; gchar d_name[NAME_MAX + 1];
}; };
struct DIR
{
gchar *dir_name;
gboolean just_opened;
guint find_file_handle;
gpointer find_file_data;
struct dirent readdir_result;
};
typedef struct DIR DIR;
/* emulation functions */ /* emulation functions */
extern int g_win32_ftruncate (gint f, extern int g_win32_ftruncate (gint f,
guint size); guint size);

5
glib/gwin32.c
View File

@ -130,7 +130,6 @@ g_win32_opendir (const char *dirname)
struct dirent* struct dirent*
g_win32_readdir (DIR *dir) g_win32_readdir (DIR *dir)
{ {
static struct dirent result;
gchar *basename; gchar *basename;
g_return_val_if_fail (dir != NULL, NULL); g_return_val_if_fail (dir != NULL, NULL);
@ -157,11 +156,11 @@ g_win32_readdir (DIR *dir)
basename = g_path_get_basename (((LPWIN32_FIND_DATA) dir->find_file_data)->cFileName); basename = g_path_get_basename (((LPWIN32_FIND_DATA) dir->find_file_data)->cFileName);
strcpy (result.d_name, basename); strcpy (dir->readdir_result.d_name, basename);
g_free (basename); g_free (basename);
return &result; return &dir->readdir_result;
} }
void void

5
glib/makefile.mingw.in
View File

@ -7,12 +7,13 @@
# should be in your PATH. # should be in your PATH.
BIN = /bin BIN = /bin
GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
TOP = .. TOP = ..
include build/win32/make.mingw include build/win32/make.mingw
# Possibly override GLib version in build/win32/module.defs
GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
################################################################ ################################################################
# Nothing much configurable below # Nothing much configurable below

151
glib/makefile.msc.in
View File

@ -1,67 +1,52 @@
## Makefile for building the GLib, gmodule and gthread dlls with Microsoft C ## Makefile for building the GLib dlls with Microsoft C
## Use: nmake -f makefile.msc install ## Use: nmake -f makefile.msc install
# Change this to wherever you want to install the DLLs. This directory # Change this to wherever you want to install the DLLs. This directory
# should be in your PATH. # should be in your PATH.
BIN = C:\bin BIN = C:\bin
# This is the location of pthreads for Win32, TOP = ..
# see http://sourceware.cygnus.com/pthreads-win32/
# We want the 1999-05-30 snapshot. !INCLUDE $(TOP)\build\win32\make.msc
PTHREADS = ..\pthreads-snap-1999-05-30
PTHREAD_LIB = $(PTHREADS)\pthread.lib # Possibly override GLib version in build\win32\module.defs
PTHREAD_INC = -I $(PTHREADS) GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
################################################################ ################################################################
# Nothing much configurable below # Nothing much configurable below
!IFNDEF DEBUG INCLUDES = -I .
# Full optimization: DEFINES = -DHAVE_CONFIG_H -DGLIB_COMPILATION -DG_LOG_DOMAIN=g_log_domain_glib
OPTIMIZE = -Ox -MD DEPCFLAGS = $(LIBICONV_CFLAGS)
LINKDEBUG =
!ELSE
# Debugging:
OPTIMIZE = -Zi -MDd
LINKDEBUG = /debug
!ENDIF
# cl -? describes the options DLLS_TO_BUILD = \
CC = cl -G5 -GF $(OPTIMIZE) -W3 -nologo glib-$(GLIB_VER).dll \
sub-gmodule \
# No general LDFLAGS needed sub-gthread \
LDFLAGS = /link $(LINKDEBUG) sub-gobject
INSTALL = copy
GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
CFLAGS = -I. -DHAVE_CONFIG_H
all : \ all : \
glibconfig.h \
config.h \ config.h \
glib-$(GLIB_VER).dll \ glibconfig.h \
gmodule\gmoduleconf.h \ $(DLLS_TO_BUILD) \
gmodule-$(GLIB_VER).dll \
gthread-$(GLIB_VER).dll \
testglib.exe \ testglib.exe \
testgmodule.exe \
testgdate.exe \ testgdate.exe \
testgdateparser.exe testgdateparser.exe
install : all install : all
$(INSTALL) glib-$(GLIB_VER).dll $(BIN) copy glib-$(GLIB_VER).dll $(BIN)
$(INSTALL) gmodule-$(GLIB_VER).dll $(BIN)
$(INSTALL) gthread-$(GLIB_VER).dll $(BIN)
glib_OBJECTS = \ glib_OBJECTS = \
garray.obj \ garray.obj \
gasyncqueue.obj \ gasyncqueue.obj \
gbacktrace.obj \
gcache.obj \ gcache.obj \
gcompletion.obj \ gcompletion.obj \
gdataset.obj \ gdataset.obj \
gdate.obj \ gdate.obj \
gerror.obj \ gerror.obj \
gconvert.obj \
ghash.obj \ ghash.obj \
ghook.obj \ ghook.obj \
giochannel.obj \ giochannel.obj \
@ -89,91 +74,69 @@ glib_OBJECTS = \
gutils.obj \ gutils.obj \
gwin32.obj gwin32.obj
glib-$(GLIB_VER).dll : $(glib_OBJECTS) glib.def
$(CC) $(CFLAGS) -LD -Feglib-$(GLIB_VER).dll $(glib_OBJECTS) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:glib.def
glibconfig.h: glibconfig.h.win32 glibconfig.h: glibconfig.h.win32
copy glibconfig.h.win32 glibconfig.h copy glibconfig.h.win32 glibconfig.h
config.h: config.h.win32 config.h: config.h.win32
copy config.h.win32 config.h copy config.h.win32 config.h
.c.obj : makefile.msc: makefile.msc.in
$(CC) $(CFLAGS) -GD -c -DGLIB_COMPILATION -DG_LOG_DOMAIN=g_log_domain_glib $< $(SED) -e s,@GLIB[_]MAJOR_VERSION@,@GLIB_MAJOR_VERSION@, \
-e s,@GLIB[_]MINOR_VERSION@,@GLIB_MINOR_VERSION@, <makefile.msc.in >$@
.c.i : ################ glib
$(CC) $(CFLAGS) -GD -E -DGLIB_COMPILATION -DG_LOG_DOMAIN=g_log_domain_glib $< >$@
gmodule_OBJECTS = \ glib-$(GLIB_VER).dll : $(glib_OBJECTS) glib.def
gmodule.obj $(CC) $(CFLAGS) -LD -Feglib-$(GLIB_VER).dll $(glib_OBJECTS) $(LIBICONV_LIBS) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:glib.def
gmodule-$(GLIB_VER).dll : $(gmodule_OBJECTS) gmodule\gmodule.def ################ subdirectories
$(CC) $(CFLAGS) -LD -Fegmodule-$(GLIB_VER).dll $(gmodule_OBJECTS) glib-$(GLIB_VER).lib $(LDFLAGS) /def:gmodule\gmodule.def
gmodule.obj : gmodule\gmodule.c gmodule\gmodule-win32.c sub-gmodule :
$(CC) $(CFLAGS) -GD -Igmodule -c -DG_LOG_DOMAIN=g_log_domain_gmodule gmodule\gmodule.c cd gmodule
-$(MAKE) -f makefile.msc all
cd ..
gmodule\gmoduleconf.h: gmodule\gmoduleconf.h.win32 sub-gthread :
copy gmodule\gmoduleconf.h.win32 gmodule\gmoduleconf.h cd gthread
-$(MAKE) -f makefile.msc all
cd ..
gthread_OBJECTS = \ sub-gobject :
gthread-impl.obj cd gobject
-$(MAKE) -f makefile.msc all
cd ..
gthread-$(GLIB_VER).dll : $(gthread_OBJECTS) gthread\gthread.def ################ test progs
$(CC) $(CFLAGS) -LD -Fegthread-$(GLIB_VER).dll $(gthread_OBJECTS) glib-$(GLIB_VER).lib $(PTHREAD_LIB) $(LDFLAGS) /def:gthread\gthread.def
gthread-impl.obj : gthread\gthread-impl.c gthread\gthread-posix.c testglib.obj : testglib.c
$(CC) $(CFLAGS) -GD $(PTHREAD_INC) -DG_LOG_DOMAIN=\"GThread\" -c gthread\gthread-impl.c $(CC) -c $(CFLAGS) -DG_LOG_DOMAIN=\"testglib\" testglib.c
testglib.exe : glib-$(GLIB_VER).dll testglib.obj testglib.exe : glib-$(GLIB_VER).dll testglib.obj
$(CC) $(CFLAGS) -Fetestglib.exe testglib.obj glib-$(GLIB_VER).lib $(LDFLAGS) /subsystem:console $(CC) $(CFLAGS) -Fetestglib.exe testglib.obj glib-$(GLIB_VER).lib $(LDFLAGS) /subsystem:console
testglib.obj : testglib.c testgdate.obj : testgdate.c
$(CC) -c $(CFLAGS) testglib.c $(CC) -c $(CFLAGS) -DG_LOG_DOMAIN=\"testgdate\" testgdate.c
testgdate.exe : glib-$(GLIB_VER).dll testgdate.obj testgdate.exe : glib-$(GLIB_VER).dll testgdate.obj
$(CC) $(CFLAGS) -Fetestgdate.exe testgdate.obj glib-$(GLIB_VER).lib $(LDFLAGS) /subsystem:console $(CC) $(CFLAGS) -Fetestgdate.exe testgdate.obj glib-$(GLIB_VER).lib $(LDFLAGS) /subsystem:console
testgdate.obj : testgdate.c testgdateparser.obj : testgdateparser.c
$(CC) -c $(CFLAGS) testgdate.c $(CC) -c $(CFLAGS) -DG_LOG_DOMAIN=\"testgdateparser\" testgdateparser.c
testgdateparser.exe : glib-$(GLIB_VER).dll testgdateparser.obj testgdateparser.exe : glib-$(GLIB_VER).dll testgdateparser.obj
$(CC) $(CFLAGS) -Fetestgdateparser.exe testgdateparser.obj glib-$(GLIB_VER).lib $(LDFLAGS) /subsystem:console $(CC) $(CFLAGS) -Fetestgdateparser.exe testgdateparser.obj glib-$(GLIB_VER).lib $(LDFLAGS) /subsystem:console
testgdateparser.obj : testgdateparser.c ################ other stuff
$(CC) -c $(CFLAGS) testgdateparser.c
testgmodule.exe : glib-$(GLIB_VER).dll gmodule-$(GLIB_VER).dll testgmodule.obj libgplugin_a.dll libgplugin_b.dll clean::
$(CC) $(CFLAGS) testgmodule.obj glib-$(GLIB_VER).lib gmodule-$(GLIB_VER).lib $(LDFLAGS) /subsystem:console
testgmodule.obj : gmodule\testgmodule.c
$(CC) $(CFLAGS) -Igmodule -c gmodule\testgmodule.c
libgplugin_a.dll : libgplugin_a.obj
$(CC) $(CFLAGS) -LD libgplugin_a.obj glib-$(GLIB_VER).lib gmodule-$(GLIB_VER).lib $(LDFLAGS)
libgplugin_a.obj : gmodule\libgplugin_a.c
$(CC) $(CFLAGS) -Igmodule -c gmodule\libgplugin_a.c
libgplugin_b.dll : libgplugin_b.obj
$(CC) $(CFLAGS) -LD libgplugin_b.obj glib-$(GLIB_VER).lib gmodule-$(GLIB_VER).lib $(LDFLAGS)
libgplugin_b.obj : gmodule\libgplugin_b.c
$(CC) $(CFLAGS) -Igmodule -c gmodule\libgplugin_b.c
clean:
del config.h del config.h
del glibconfig.h del glibconfig.h
del gmodule\gmoduleconf.h cd gmodule
del *.exe $(MAKE) -f makefile.msc clean
del *.obj cd ..
del *.dll cd gthread
del *.lib $(MAKE) -f makefile.msc clean
del *.err cd ..
del *.map cd gobject
del *.sym $(MAKE) -f makefile.msc clean
del *.exp cd ..
del *.lk1
del *.mk1
del *.pdb
del *.ilk

5
gmodule/Makefile.am
View File

@ -6,6 +6,8 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gmodule \
EXTRA_DIST = \ EXTRA_DIST = \
makefile.mingw \ makefile.mingw \
makefile.mingw.in \ makefile.mingw.in \
makefile.msc \
makefile.msc.in \
gmoduleconf.h.in \ gmoduleconf.h.in \
gmodule.def \ gmodule.def \
gmodule-dl.c \ gmodule-dl.c \
@ -58,6 +60,9 @@ gmodule.rc: $(top_builddir)/config.status $(top_srcdir)/gmodule/gmodule.rc.in
makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/gmodule/makefile.mingw.in makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/gmodule/makefile.mingw.in
cd $(top_builddir) && CONFIG_FILES=gmodule/$@ CONFIG_HEADERS= $(SHELL) ./config.status cd $(top_builddir) && CONFIG_FILES=gmodule/$@ CONFIG_HEADERS= $(SHELL) ./config.status
makefile.msc: $(top_builddir)/config.status $(top_srcdir)/gmodule/makefile.msc.in
cd $(top_builddir) && CONFIG_FILES=gmodule/$@ CONFIG_HEADERS= $(SHELL) ./config.status
.PHONY: files release .PHONY: files release
files: files:

5
gmodule/makefile.mingw.in
View File

@ -3,12 +3,13 @@
## Use: make -f makefile.mingw ## Use: make -f makefile.mingw
GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
TOP = ../.. TOP = ../..
include ../build/win32/make.mingw include ../build/win32/make.mingw
# Possibly override GLib version in build\win32\module.defs
GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
################################################################ ################################################################
# Nothing much configurable below # Nothing much configurable below

48
gmodule/makefile.msc.in Normal file
View File

@ -0,0 +1,48 @@
## Makefile for building the gmodule dll with Microsoft C
## Use: nmake -f makefile.msc install
TOP = ..\..
!INCLUDE $(TOP)\build\win32\make.msc
# Possibly override GLib version in build\win32\module.defs
GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
################################################################
# Nothing much configurable below
INCLUDES = -I .. -I .
DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=g_log_domain_gmodule
all : \
gmoduleconf.h \
gmodule-$(GLIB_VER).dll \
testgmodule.exe
gmodule_OBJECTS = \
gmodule.obj
gmoduleconf.h: gmoduleconf.h.win32
copy gmoduleconf.h.win32 gmoduleconf.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 >$@
gmodule-$(GLIB_VER).dll : $(gmodule_OBJECTS) gmodule.def
$(CC) $(CFLAGS) -LD -Fegmodule-$(GLIB_VER).dll $(gmodule_OBJECTS) ..\glib-$(GLIB_VER).lib $(LDFLAGS) /def:gmodule.def
################ test prog
testgmodule.exe : gmodule-$(GLIB_VER).dll testgmodule.obj libgplugin_a.dll libgplugin_b.dll
$(CC) $(CFLAGS) testgmodule.obj gmodule-$(GLIB_VER).lib ..\glib-$(GLIB_VER).lib $(LDFLAGS) /subsystem:console
libgplugin_a.dll : libgplugin_a.obj
$(CC) $(CFLAGS) -LD libgplugin_a.obj gmodule-$(GLIB_VER).lib ..\glib-$(GLIB_VER).lib $(LDFLAGS)
libgplugin_b.dll : libgplugin_b.obj
$(CC) $(CFLAGS) -LD libgplugin_b.obj gmodule-$(GLIB_VER).lib ..\glib-$(GLIB_VER).lib $(LDFLAGS)
clean::
del gmoduleconf.h

4
gobject/Makefile.am
View File

@ -83,6 +83,8 @@ gobject_query_LDADD = $(progs_LDADD)
EXTRA_DIST += \ EXTRA_DIST += \
makefile.mingw \ makefile.mingw \
makefile.mingw.in \ makefile.mingw.in \
makefile.msc \
makefile.msc.in \
gobject.def \ gobject.def \
gobject.rc \ gobject.rc \
gobject.rc.in gobject.rc.in
@ -93,3 +95,5 @@ gobject.rc: $(top_builddir)/config.status $(top_srcdir)/gobject/gobject.rc.in
makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/gobject/makefile.mingw.in makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/gobject/makefile.mingw.in
cd $(top_builddir) && CONFIG_FILES=gobject/$@ CONFIG_HEADERS= $(SHELL) ./config.status cd $(top_builddir) && CONFIG_FILES=gobject/$@ CONFIG_HEADERS= $(SHELL) ./config.status
makefile.msc: $(top_builddir)/config.status $(top_srcdir)/gobject/makefile.msc.in
cd $(top_builddir) && CONFIG_FILES=gobject/$@ CONFIG_HEADERS= $(SHELL) ./config.status

4
gobject/makefile.mingw.in
View File

@ -3,12 +3,14 @@
## Use: make -f makefile.mingw ## Use: make -f makefile.mingw
GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
TOP = ../.. TOP = ../..
include ../build/win32/make.mingw include ../build/win32/make.mingw
# Possibly override GLib version in build/win32/module.defs
GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
################################################################ ################################################################
# Nothing much configurable below # Nothing much configurable below

35
gobject/makefile.msc.in Normal file
View File

@ -0,0 +1,35 @@
## Makefile for building the gobject dll with Microsoft C
## Use: nmake -f makefile.msc install
TOP = ..\..
!INCLUDE $(TOP)\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_gobject
all : \
gobject-$(GLIB_VER).dll
gobject_OBJECTS = \
gvalue.obj \
gvaluetypes.obj \
gparam.obj \
gparamspecs.obj \
genums.obj \
gobject.obj \
gtype.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

5
gthread/Makefile.am
View File

@ -6,6 +6,8 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gthread \
EXTRA_DIST = \ EXTRA_DIST = \
makefile.mingw \ makefile.mingw \
makefile.mingw.in \ makefile.mingw.in \
makefile.msc \
makefile.msc.in \
gthread-posix.c \ gthread-posix.c \
gthread-solaris.c \ gthread-solaris.c \
gthread-none.c \ gthread-none.c \
@ -31,3 +33,6 @@ gthread.rc: $(top_builddir)/config.status $(top_srcdir)/gthread/gthread.rc.in
makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/gthread/makefile.mingw.in makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/gthread/makefile.mingw.in
cd $(top_builddir) && CONFIG_FILES=gthread/$@ CONFIG_HEADERS= $(SHELL) ./config.status cd $(top_builddir) && CONFIG_FILES=gthread/$@ CONFIG_HEADERS= $(SHELL) ./config.status
makefile.msc: $(top_builddir)/config.status $(top_srcdir)/gthread/makefile.msc.in
cd $(top_builddir) && CONFIG_FILES=gthread/$@ CONFIG_HEADERS= $(SHELL) ./config.status

5
gthread/makefile.mingw.in
View File

@ -3,12 +3,13 @@
## Use: make -f makefile.mingw ## Use: make -f makefile.mingw
GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
TOP = ../.. TOP = ../..
include ../build/win32/make.mingw include ../build/win32/make.mingw
# Possibly override GLib version in build/win32/module.defs
GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
################################################################ ################################################################
# Nothing much configurable below # Nothing much configurable below

32
gthread/makefile.msc.in Normal file
View File

@ -0,0 +1,32 @@
## Makefile for building the gthread dll with Microsoft C
## Use: nmake -f makefile.msc install
GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
TOP = ..\..
!INCLUDE $(TOP)\build\win32\make.msc
# Possibly override GLib version in build\win32\module.defs
GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
################################################################
# Nothing much configurable below
INCLUDES = -I .. -I .
DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GThread\"
DEPCFLAGS = $(PTHREAD_CFLAGS)
all : \
gthread-$(GLIB_VER).dll
gthread_OBJECTS = \
gthread-impl.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 >$@
gthread-$(GLIB_VER).dll : $(gthread_OBJECTS) gthread.def
$(CC) $(CFLAGS) -LD -Fegthread-$(GLIB_VER).dll $(gthread_OBJECTS) ..\glib-$(GLIB_VER).lib $(PTHREAD_LIBS) $(LDFLAGS) /def:gthread.def

5
gwin32.c
View File

@ -130,7 +130,6 @@ g_win32_opendir (const char *dirname)
struct dirent* struct dirent*
g_win32_readdir (DIR *dir) g_win32_readdir (DIR *dir)
{ {
static struct dirent result;
gchar *basename; gchar *basename;
g_return_val_if_fail (dir != NULL, NULL); g_return_val_if_fail (dir != NULL, NULL);
@ -157,11 +156,11 @@ g_win32_readdir (DIR *dir)
basename = g_path_get_basename (((LPWIN32_FIND_DATA) dir->find_file_data)->cFileName); basename = g_path_get_basename (((LPWIN32_FIND_DATA) dir->find_file_data)->cFileName);
strcpy (result.d_name, basename); strcpy (dir->readdir_result.d_name, basename);
g_free (basename); g_free (basename);
return &result; return &dir->readdir_result;
} }
void void

5
makefile.mingw.in
View File

@ -7,12 +7,13 @@
# should be in your PATH. # should be in your PATH.
BIN = /bin BIN = /bin
GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
TOP = .. TOP = ..
include build/win32/make.mingw include build/win32/make.mingw
# Possibly override GLib version in build/win32/module.defs
GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
################################################################ ################################################################
# Nothing much configurable below # Nothing much configurable below

151
makefile.msc.in
View File

@ -1,67 +1,52 @@
## Makefile for building the GLib, gmodule and gthread dlls with Microsoft C ## Makefile for building the GLib dlls with Microsoft C
## Use: nmake -f makefile.msc install ## Use: nmake -f makefile.msc install
# Change this to wherever you want to install the DLLs. This directory # Change this to wherever you want to install the DLLs. This directory
# should be in your PATH. # should be in your PATH.
BIN = C:\bin BIN = C:\bin
# This is the location of pthreads for Win32, TOP = ..
# see http://sourceware.cygnus.com/pthreads-win32/
# We want the 1999-05-30 snapshot. !INCLUDE $(TOP)\build\win32\make.msc
PTHREADS = ..\pthreads-snap-1999-05-30
PTHREAD_LIB = $(PTHREADS)\pthread.lib # Possibly override GLib version in build\win32\module.defs
PTHREAD_INC = -I $(PTHREADS) GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
################################################################ ################################################################
# Nothing much configurable below # Nothing much configurable below
!IFNDEF DEBUG INCLUDES = -I .
# Full optimization: DEFINES = -DHAVE_CONFIG_H -DGLIB_COMPILATION -DG_LOG_DOMAIN=g_log_domain_glib
OPTIMIZE = -Ox -MD DEPCFLAGS = $(LIBICONV_CFLAGS)
LINKDEBUG =
!ELSE
# Debugging:
OPTIMIZE = -Zi -MDd
LINKDEBUG = /debug
!ENDIF
# cl -? describes the options DLLS_TO_BUILD = \
CC = cl -G5 -GF $(OPTIMIZE) -W3 -nologo glib-$(GLIB_VER).dll \
sub-gmodule \
# No general LDFLAGS needed sub-gthread \
LDFLAGS = /link $(LINKDEBUG) sub-gobject
INSTALL = copy
GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
CFLAGS = -I. -DHAVE_CONFIG_H
all : \ all : \
glibconfig.h \
config.h \ config.h \
glib-$(GLIB_VER).dll \ glibconfig.h \
gmodule\gmoduleconf.h \ $(DLLS_TO_BUILD) \
gmodule-$(GLIB_VER).dll \
gthread-$(GLIB_VER).dll \
testglib.exe \ testglib.exe \
testgmodule.exe \
testgdate.exe \ testgdate.exe \
testgdateparser.exe testgdateparser.exe
install : all install : all
$(INSTALL) glib-$(GLIB_VER).dll $(BIN) copy glib-$(GLIB_VER).dll $(BIN)
$(INSTALL) gmodule-$(GLIB_VER).dll $(BIN)
$(INSTALL) gthread-$(GLIB_VER).dll $(BIN)
glib_OBJECTS = \ glib_OBJECTS = \
garray.obj \ garray.obj \
gasyncqueue.obj \ gasyncqueue.obj \
gbacktrace.obj \
gcache.obj \ gcache.obj \
gcompletion.obj \ gcompletion.obj \
gdataset.obj \ gdataset.obj \
gdate.obj \ gdate.obj \
gerror.obj \ gerror.obj \
gconvert.obj \
ghash.obj \ ghash.obj \
ghook.obj \ ghook.obj \
giochannel.obj \ giochannel.obj \
@ -89,91 +74,69 @@ glib_OBJECTS = \
gutils.obj \ gutils.obj \
gwin32.obj gwin32.obj
glib-$(GLIB_VER).dll : $(glib_OBJECTS) glib.def
$(CC) $(CFLAGS) -LD -Feglib-$(GLIB_VER).dll $(glib_OBJECTS) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:glib.def
glibconfig.h: glibconfig.h.win32 glibconfig.h: glibconfig.h.win32
copy glibconfig.h.win32 glibconfig.h copy glibconfig.h.win32 glibconfig.h
config.h: config.h.win32 config.h: config.h.win32
copy config.h.win32 config.h copy config.h.win32 config.h
.c.obj : makefile.msc: makefile.msc.in
$(CC) $(CFLAGS) -GD -c -DGLIB_COMPILATION -DG_LOG_DOMAIN=g_log_domain_glib $< $(SED) -e s,@GLIB[_]MAJOR_VERSION@,@GLIB_MAJOR_VERSION@, \
-e s,@GLIB[_]MINOR_VERSION@,@GLIB_MINOR_VERSION@, <makefile.msc.in >$@
.c.i : ################ glib
$(CC) $(CFLAGS) -GD -E -DGLIB_COMPILATION -DG_LOG_DOMAIN=g_log_domain_glib $< >$@
gmodule_OBJECTS = \ glib-$(GLIB_VER).dll : $(glib_OBJECTS) glib.def
gmodule.obj $(CC) $(CFLAGS) -LD -Feglib-$(GLIB_VER).dll $(glib_OBJECTS) $(LIBICONV_LIBS) user32.lib advapi32.lib wsock32.lib $(LDFLAGS) /def:glib.def
gmodule-$(GLIB_VER).dll : $(gmodule_OBJECTS) gmodule\gmodule.def ################ subdirectories
$(CC) $(CFLAGS) -LD -Fegmodule-$(GLIB_VER).dll $(gmodule_OBJECTS) glib-$(GLIB_VER).lib $(LDFLAGS) /def:gmodule\gmodule.def
gmodule.obj : gmodule\gmodule.c gmodule\gmodule-win32.c sub-gmodule :
$(CC) $(CFLAGS) -GD -Igmodule -c -DG_LOG_DOMAIN=g_log_domain_gmodule gmodule\gmodule.c cd gmodule
-$(MAKE) -f makefile.msc all
cd ..
gmodule\gmoduleconf.h: gmodule\gmoduleconf.h.win32 sub-gthread :
copy gmodule\gmoduleconf.h.win32 gmodule\gmoduleconf.h cd gthread
-$(MAKE) -f makefile.msc all
cd ..
gthread_OBJECTS = \ sub-gobject :
gthread-impl.obj cd gobject
-$(MAKE) -f makefile.msc all
cd ..
gthread-$(GLIB_VER).dll : $(gthread_OBJECTS) gthread\gthread.def ################ test progs
$(CC) $(CFLAGS) -LD -Fegthread-$(GLIB_VER).dll $(gthread_OBJECTS) glib-$(GLIB_VER).lib $(PTHREAD_LIB) $(LDFLAGS) /def:gthread\gthread.def
gthread-impl.obj : gthread\gthread-impl.c gthread\gthread-posix.c testglib.obj : testglib.c
$(CC) $(CFLAGS) -GD $(PTHREAD_INC) -DG_LOG_DOMAIN=\"GThread\" -c gthread\gthread-impl.c $(CC) -c $(CFLAGS) -DG_LOG_DOMAIN=\"testglib\" testglib.c
testglib.exe : glib-$(GLIB_VER).dll testglib.obj testglib.exe : glib-$(GLIB_VER).dll testglib.obj
$(CC) $(CFLAGS) -Fetestglib.exe testglib.obj glib-$(GLIB_VER).lib $(LDFLAGS) /subsystem:console $(CC) $(CFLAGS) -Fetestglib.exe testglib.obj glib-$(GLIB_VER).lib $(LDFLAGS) /subsystem:console
testglib.obj : testglib.c testgdate.obj : testgdate.c
$(CC) -c $(CFLAGS) testglib.c $(CC) -c $(CFLAGS) -DG_LOG_DOMAIN=\"testgdate\" testgdate.c
testgdate.exe : glib-$(GLIB_VER).dll testgdate.obj testgdate.exe : glib-$(GLIB_VER).dll testgdate.obj
$(CC) $(CFLAGS) -Fetestgdate.exe testgdate.obj glib-$(GLIB_VER).lib $(LDFLAGS) /subsystem:console $(CC) $(CFLAGS) -Fetestgdate.exe testgdate.obj glib-$(GLIB_VER).lib $(LDFLAGS) /subsystem:console
testgdate.obj : testgdate.c testgdateparser.obj : testgdateparser.c
$(CC) -c $(CFLAGS) testgdate.c $(CC) -c $(CFLAGS) -DG_LOG_DOMAIN=\"testgdateparser\" testgdateparser.c
testgdateparser.exe : glib-$(GLIB_VER).dll testgdateparser.obj testgdateparser.exe : glib-$(GLIB_VER).dll testgdateparser.obj
$(CC) $(CFLAGS) -Fetestgdateparser.exe testgdateparser.obj glib-$(GLIB_VER).lib $(LDFLAGS) /subsystem:console $(CC) $(CFLAGS) -Fetestgdateparser.exe testgdateparser.obj glib-$(GLIB_VER).lib $(LDFLAGS) /subsystem:console
testgdateparser.obj : testgdateparser.c ################ other stuff
$(CC) -c $(CFLAGS) testgdateparser.c
testgmodule.exe : glib-$(GLIB_VER).dll gmodule-$(GLIB_VER).dll testgmodule.obj libgplugin_a.dll libgplugin_b.dll clean::
$(CC) $(CFLAGS) testgmodule.obj glib-$(GLIB_VER).lib gmodule-$(GLIB_VER).lib $(LDFLAGS) /subsystem:console
testgmodule.obj : gmodule\testgmodule.c
$(CC) $(CFLAGS) -Igmodule -c gmodule\testgmodule.c
libgplugin_a.dll : libgplugin_a.obj
$(CC) $(CFLAGS) -LD libgplugin_a.obj glib-$(GLIB_VER).lib gmodule-$(GLIB_VER).lib $(LDFLAGS)
libgplugin_a.obj : gmodule\libgplugin_a.c
$(CC) $(CFLAGS) -Igmodule -c gmodule\libgplugin_a.c
libgplugin_b.dll : libgplugin_b.obj
$(CC) $(CFLAGS) -LD libgplugin_b.obj glib-$(GLIB_VER).lib gmodule-$(GLIB_VER).lib $(LDFLAGS)
libgplugin_b.obj : gmodule\libgplugin_b.c
$(CC) $(CFLAGS) -Igmodule -c gmodule\libgplugin_b.c
clean:
del config.h del config.h
del glibconfig.h del glibconfig.h
del gmodule\gmoduleconf.h cd gmodule
del *.exe $(MAKE) -f makefile.msc clean
del *.obj cd ..
del *.dll cd gthread
del *.lib $(MAKE) -f makefile.msc clean
del *.err cd ..
del *.map cd gobject
del *.sym $(MAKE) -f makefile.msc clean
del *.exp cd ..
del *.lk1
del *.mk1
del *.pdb
del *.ilk

37
tests/makefile.msc.in
View File

@ -1,19 +1,19 @@
## Makefile for building the GLib test programs with Microsoft C ## Makefile for building the GLib test programs with Microsoft C
## Use: nmake -f makefile.msc check ## Use: nmake -f makefile.msc check
TOP = ..\..
!INCLUDE $(TOP)\build\win32\make.msc
# Possibly override GLib version in build\win32\module.defs
GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
################################################################ ################################################################
# Nothing much configurable below # Nothing much configurable below
# cl -? describes the options INCLUDES = -I..
CC = cl -G5 -GF -Ox -W3 -MD -nologo DEFINES = -DHAVE_CONFIG_H
# No general LDFLAGS needed
LDFLAGS = /link
GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
CFLAGS = -I.. -DHAVE_CONFIG_H
TESTS = \ TESTS = \
array-test.exe \ array-test.exe \
@ -26,7 +26,7 @@ TESTS = \
rand-test.exe \ rand-test.exe \
relation-test.exe\ relation-test.exe\
slist-test.exe \ slist-test.exe \
strfunc-test.exe\ # strfunc-test.exe\
string-test.exe \ string-test.exe \
thread-test.exe \ thread-test.exe \
threadpool-test.exe\ threadpool-test.exe\
@ -35,20 +35,13 @@ TESTS = \
all : $(TESTS) all : $(TESTS)
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 >$@
.c.exe : .c.exe :
$(CC) $(CFLAGS) -c $< $(CC) $(CFLAGS) -c $<
$(CC) $(CFLAGS) -Fe$@ $< ..\glib-$(GLIB_VER).lib ..\gthread-$(GLIB_VER).lib $(LDFLAGS) /subsystem:console $(CC) $(CFLAGS) -Fe$@ $< ..\glib-$(GLIB_VER).lib ..\gmodule\gmodule-$(GLIB_VER).lib ..\gthread\gthread-$(GLIB_VER).lib $(LDFLAGS) /subsystem:console
check: all check: all
for %p in ($(TESTS)) do %p for %p in ($(TESTS)) do %p
clean:
del *.exe
del *.obj
del *.dll
del *.lib
del *.err
del *.map
del *.sym
del *.exp
del *.pdb