luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-03 16:03:40 +02: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
Download Patch File Download Diff File Expand all files Collapse all files

37
tests/makefile.msc.in
View File

@@ -1,19 +1,19 @@
## Makefile for building the GLib test programs with Microsoft C
## 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
# cl -? describes the options
CC = cl -G5 -GF -Ox -W3 -MD -nologo
# No general LDFLAGS needed
LDFLAGS = /link
GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
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