[cairo-commit] boilerplate/Makefile.win32 Makefile.win32 pixman/src src/Makefile.win32 test/Makefile.win32

[Vladimir Vukicevic]

 Makefile.win32             |    3 ++-
 boilerplate/Makefile.win32 |    2 +-
 pixman/src/Makefile.win32  |    2 +-
 src/Makefile.win32         |    4 ++--
 test/Makefile.win32        |    6 ++----
 5 files changed, 8 insertions(+), 9 deletions(-)

New commits:
diff-tree 00d5a2ed48d999a29708d4750c034bbf1b91de12 (from d78fd375d3f99a5bb4a4799ce5d90a2a946a854c)
Author: Vladimir Vukicevic <vladimir at pobox.com>
Date:   Sat Sep 9 23:29:17 2006 -0700

    [win32] Makefile.win32: use correct (/MD) runtime library flag everywhere
    
    There was a bad mix of LIBCMT (the static runtime lib) and MSVCRT (the dynamic
    one) before, because LIBCMT is the default.  This specifies /MD everywhere.

diff --git a/Makefile.win32 b/Makefile.win32
index 048275d..25fee71 100644
--- a/Makefile.win32
+++ b/Makefile.win32
@@ -23,7 +23,8 @@ test: cairo
 	@list='$(TEST_SUBDIRS)'; for f in $$list ; do \
 		echo making all in $$f... ; \
 		(cd $$f ; make -f Makefile.win32) || exit 1 ; \
-	done ;
+	done
+	@(cd test ; make -f Makefile.win32 test)
 
 html:
 	@(cd test ; make -f Makefile.win32 html)
diff --git a/boilerplate/Makefile.win32 b/boilerplate/Makefile.win32
index c2696c7..87c1d44 100644
--- a/boilerplate/Makefile.win32
+++ b/boilerplate/Makefile.win32
@@ -1,5 +1,5 @@
 CC = cl
-CFLAGS = /nologo /Zi /O2 /I../src /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE
+CFLAGS = /nologo /MD /Zi /O2 /I../src /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE
 
 SOURCES = \
 	cairo-boilerplate.c \
diff --git a/pixman/src/Makefile.win32 b/pixman/src/Makefile.win32
index 8f9ad16..ec83f73 100644
--- a/pixman/src/Makefile.win32
+++ b/pixman/src/Makefile.win32
@@ -1,5 +1,5 @@
 CC = cl
-CFLAGS = /nologo /Zi /O2 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE
+CFLAGS = /nologo /MD /Zi /O2 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE
 
 SOURCES = \
 	fbcompose.c \
diff --git a/src/Makefile.win32 b/src/Makefile.win32
index 50b419d..1b91d4d 100644
--- a/src/Makefile.win32
+++ b/src/Makefile.win32
@@ -1,7 +1,7 @@
 CC = cl
 LINK = link
 
-CFLAGS = /Zi /nologo /O2 /c /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /I../pixman/src /I. /DPACKAGE_VERSION="" /DPACKAGE_BUGREPORT=""
+CFLAGS = /MD /Zi /nologo /O2 /c /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /I../pixman/src /I. /DPACKAGE_VERSION="" /DPACKAGE_BUGREPORT=""
 
 DEFFILE = cairo.def
 srcdir = `pwd`
@@ -97,7 +97,7 @@ $(DEFFILE):
 	@ ! grep -q cairo_ERROR $@ || ($(RM) $@; false)
 
 cairo.dll: $(OBJECTS) $(SHARED_OBJECTS) $(DEFFILE)
-	$(CC) /Zi /LD /Fe$@ ../pixman/src/pixman.lib $(OBJECTS) $(SHARED_OBJECTS) /link /DEF:$(DEFFILE) user32.lib gdi32.lib libpng.lib zlib.lib /NODEFAULTLIB:LIBCMT
+	$(CC) /MD /Zi /LD /Fe$@ ../pixman/src/pixman.lib $(OBJECTS) $(SHARED_OBJECTS) /link /DEF:$(DEFFILE) user32.lib gdi32.lib libpng.lib zlib.lib
 
 cairo-static.lib: $(OBJECTS) $(STATIC_OBJECTS)
 	lib /NOLOGO /OUT:$@ ../pixman/src/pixman.lib $(OBJECTS) $(STATIC_OBJECTS)
diff --git a/test/Makefile.win32 b/test/Makefile.win32
index 9ffa3ba..5eefded 100644
--- a/test/Makefile.win32
+++ b/test/Makefile.win32
@@ -1,5 +1,5 @@
 CC = cl
-CFLAGS = /nologo /Zi /O2 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /I../src /I../pixman/src /I../boilerplate
+CFLAGS = /nologo /Zi /O2 /MD /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /I../src /I../pixman/src /I../boilerplate
 LDFLAGS = ../src/cairo.lib ../pixman/src/pixman.lib ../boilerplate/boiler.lib libpng.lib zlib.lib gdi32.lib msimg32.lib user32.lib
 
 TESTS = 			\
@@ -87,8 +87,6 @@ push-group			\
 zero-alpha			\
 $(NULL)
 
-BOILER_LIB = ../boilerplate/boiler.lib
-
 TESTCORE_SOURCES = \
 	cairo-test.c \
 	buffer-diff.c \
@@ -99,7 +97,7 @@ TEST_EXE = $(addsuffix .exe,$(TESTS))
 all: $(TEST_EXE)
 
 %.exe: %.c
-	@$(CC) $(CFLAGS) /Fe"$@" $<  $(TESTCORE_SOURCES) $(LDFLAGS) $(BOILER_LIB)
+	@$(CC) $(CFLAGS) /Fe"$@" $<  $(TESTCORE_SOURCES) /link $(LDFLAGS)
 
 test: $(TEST_EXE)
 	@for exe in $(TEST_EXE) ; do \