Author: mladen.turk(a)jboss.com
Date: 2007-12-13 07:44:24 -0500 (Thu, 13 Dec 2007)
New Revision: 1199
Modified:
trunk/srclib/zlib/NMAKEmakefile
Log:
Fix non i686 builds.
Modified: trunk/srclib/zlib/NMAKEmakefile
===================================================================
--- trunk/srclib/zlib/NMAKEmakefile 2007-12-13 10:36:37 UTC (rev 1198)
+++ trunk/srclib/zlib/NMAKEmakefile 2007-12-13 12:44:24 UTC (rev 1199)
@@ -29,13 +29,17 @@
!IF !DEFINED(ZLIB_DECLARE_STATIC) || "$(ZLIB_DECLARE_STATIC)" == ""
TARGET=DLL
PROJECT = libzlib1
-CFLAGS = -DZLIB_DECLARE_EXPORT $(CFLAGS)
+CFLAGS = -DZLIB_DLL -D_CRT_SECURE_NO_DEPRECATE $(CFLAGS)
!ELSE
TARGET=LIB
PROJECT = zlib1
-CFLAGS = -DZLIB_DECLARE_STATIC $(CFLAGS)
+CFLAGS = -DZLIB_WINAPI -D_CRT_SECURE_NO_DEPRECATE $(CFLAGS)
!ENDIF
+!IF "$(CPU)" != "I386"
+CFLAGS = -GS- $(CFLAGS)
+!ENDIF
+
CFLAGS = -wd4996 $(CFLAGS)
!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
Show replies by date