fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2025-12-26 12:20:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

[win32] Makefile.win32: use correct (/MD) runtime library flag everywhere

Browse source 
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.
This commit is contained in:
Vladimir Vukicevic 2006-09-09 23:29:17 -07:00 • committed by U-CYCLONE\Vladimir Vukicevic
parent d78fd375d3
commit 00d5a2ed48
5 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Makefile.win32
View file

@ -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)

2
boilerplate/Makefile.win32
View file

@ -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 \

2
pixman/src/Makefile.win32
View file

@ -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 \

4
src/Makefile.win32
View file

@ -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)

6
test/Makefile.win32
View file

@ -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 \