diff options
| author | Vladimir Vukicevic <vladimir@pobox.com> | 2006-09-09 23:29:17 -0700 |
|---|---|---|
| committer | U-CYCLONE\Vladimir Vukicevic <vladimir@cyclone.(none)> | 2006-09-09 23:29:17 -0700 |
| commit | 00d5a2ed48d999a29708d4750c034bbf1b91de12 (patch) | |
| tree | d36db3348548bd1818089194ec3e088329e5e097 /src/Makefile.win32 | |
| parent | d78fd375d3f99a5bb4a4799ce5d90a2a946a854c (diff) | |
[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.
Diffstat (limited to 'src/Makefile.win32')
| -rw-r--r-- | src/Makefile.win32 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile.win32 b/src/Makefile.win32 index 50b419df..1b91d4d8 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) |