diff options
| author | Tor Lillqvist <tml@iki.fi> | 2000-10-06 21:32:59 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2000-10-06 21:32:59 +0000 |
| commit | 8e847255e8c396a5bacbbf2897ad78e36ee47900 (patch) | |
| tree | 3d6227b8a25700022f9fe6b59531a3b349be17d5 /tests/makefile.msc.in | |
| parent | 0c6a1ee5310d872ad1f2bfdbc54df721a239c05f (diff) | |
| download | glib-8e847255e8c396a5bacbbf2897ad78e36ee47900.tar.gz | |
Revamp to be like makefile.mingw.in, make the MSVC build actually work
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.
Diffstat (limited to 'tests/makefile.msc.in')
| -rw-r--r-- | tests/makefile.msc.in | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/tests/makefile.msc.in b/tests/makefile.msc.in index 27a757c5b..eecee8dac 100644 --- a/tests/makefile.msc.in +++ b/tests/makefile.msc.in @@ -1,19 +1,19 @@ ## Makefile for building the GLib test programs with Microsoft C ## Use: nmake -f makefile.msc check -################################################################ +TOP = ..\.. -# Nothing much configurable below +!INCLUDE $(TOP)\build\win32\make.msc -# cl -? describes the options -CC = cl -G5 -GF -Ox -W3 -MD -nologo +# Possibly override GLib version in build\win32\module.defs +GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@ -# No general LDFLAGS needed -LDFLAGS = /link +################################################################ -GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@ +# Nothing much configurable below -CFLAGS = -I.. -DHAVE_CONFIG_H +INCLUDES = -I.. +DEFINES = -DHAVE_CONFIG_H TESTS = \ array-test.exe \ @@ -26,7 +26,7 @@ TESTS = \ rand-test.exe \ relation-test.exe\ slist-test.exe \ - strfunc-test.exe\ +# strfunc-test.exe\ string-test.exe \ thread-test.exe \ threadpool-test.exe\ @@ -35,20 +35,13 @@ 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 : $(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 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 |