summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2014-10-23 07:57:34 -0700
committerJames Zern <jzern@google.com>2015-03-02 18:42:48 -0800
commit855fe4354b35a7dd34c777b3a4001459bf74cf13 (patch)
tree77fcecce1af822cf3aceedb50f6d011fdc5df23d
parentb7eb6d55c78145be37ee53f56a345562d85f1cbd (diff)
downloadlibwebp-855fe4354b35a7dd34c777b3a4001459bf74cf13.tar.gz
Makefile.vc: add a 'legacy' RTLIBCFG option
disables buffer security checks (/GS-) and any machine optimizations (e.g., sse2) fixes issue #228 (cherry picked from commit 34c20c06c8276d9ff1cddc1fcf7420cffedae2ba) Change-Id: I81fa483dc1654199b2017626320383d2d63317dc
-rw-r--r--Makefile.vc8
1 files changed, 7 insertions, 1 deletions
diff --git a/Makefile.vc b/Makefile.vc
index 8135bc15..7e3f46a0 100644
--- a/Makefile.vc
+++ b/Makefile.vc
@@ -27,7 +27,7 @@ PLATFORM_LDFLAGS = /SAFESEH
NOLOGO = /nologo
CCNODBG = cl.exe $(NOLOGO) /O2 /DNDEBUG
CCDEBUG = cl.exe $(NOLOGO) /Od /Gm /Zi /D_DEBUG /RTC1
-CFLAGS = /Isrc $(NOLOGO) /W3 /EHsc /c /GS
+CFLAGS = /Isrc $(NOLOGO) /W3 /EHsc /c
CFLAGS = $(CFLAGS) /DWIN32 /D_CRT_SECURE_NO_WARNINGS /DWIN32_LEAN_AND_MEAN
CFLAGS = $(CFLAGS) /DHAVE_WINCODEC_H /DWEBP_USE_THREAD
LDFLAGS = /LARGEADDRESSAWARE /MANIFEST /NXCOMPAT /DYNAMICBASE
@@ -54,6 +54,11 @@ AVX2_FLAGS = /arch:AVX2
!IF "$(RTLIBCFG)" == "static"
RTLIB = /MT
RTLIBD = /MTd
+!ELSE IF "$(RTLIBCFG)" == "legacy"
+RTLIBCFG = static
+RTLIB = /MT
+RTLIBD = /MTd
+CFLAGS = $(CFLAGS) /GS- /arch:IA32
!ELSE
RTLIB = /MD
RTLIBD = /MDd
@@ -139,6 +144,7 @@ CFGSET = TRUE
!MESSAGE - all - build (de)mux-based targets for CFG
!MESSAGE
!MESSAGE RTLIBCFG controls the runtime library linkage - 'static' or 'dynamic'.
+!MESSAGE 'legacy' will produce a Windows 2000 compatible library.
!MESSAGE OBJDIR is the path where you like to build (obj, bins, etc.),
!MESSAGE defaults to ..\obj