summaryrefslogtreecommitdiff
path: root/trunk/win
diff options
context:
space:
mode:
authordcommander <dcommander@3789f03b-4d11-0410-bbf8-ca57d06f2519>2010-02-19 06:59:18 +0000
committerdcommander <dcommander@3789f03b-4d11-0410-bbf8-ca57d06f2519>2010-02-19 06:59:18 +0000
commit6b6004bd9f098506adfa5fc115c2c7be26450850 (patch)
tree9a34bb974d66282f6ed643c59270e44473fcbd1a /trunk/win
parent0ec481fa62fc597c3947541e4afc9e618e91e5e3 (diff)
Unfortunately, we have to use the DLL version of the C library to avoid crashes in cjpeg
git-svn-id: https://libjpeg-turbo.svn.sourceforge.net/svnroot/libjpeg-turbo@129 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'trunk/win')
-rwxr-xr-xtrunk/win/Makerules6
1 files changed, 3 insertions, 3 deletions
diff --git a/trunk/win/Makerules b/trunk/win/Makerules
index 59a7d3a..786f912 100755
--- a/trunk/win/Makerules
+++ b/trunk/win/Makerules
@@ -19,7 +19,7 @@ VERSION = 0.0.90
CC = "cl" -nologo
CXX = "cl" -EHsc -nologo
AR = "link" -lib -nologo
-LINK = "link" -nologo
+LINK = "link" -nologo -nodefaultlib:libcmt
ifeq ($(DEBUG), yes)
LINK = "link" -nologo -debug -nodefaultlib:libcmt
endif
@@ -35,10 +35,10 @@ else
NAFLAGS = -fwin32 -DWIN32 -DMSVC -Iwin/
endif
ifeq ($(DEBUG), yes)
- CFLAGS := $(CFLAGS) -Od -MTd -Zi
+ CFLAGS := $(CFLAGS) -Od -MDd -Zi
NAFLAGS := $(NAFLAGS) -g
else
- CFLAGS := $(CFLAGS) -O2 -MT
+ CFLAGS := $(CFLAGS) -O2 -MD
endif
WITH_SIMD = yes