[jbossnative-commits] JBoss Native SVN: r1444 - trunk/srclib/zlib.
Author: mladen.turk(a)jboss.com
Date: 2008-03-16 17:29:21 -0400 (Sun, 16 Mar 2008)
New Revision: 1444
Modified:
trunk/srclib/zlib/NMAKEmakefile
Log:
Update to new CPU notation.
Modified: trunk/srclib/zlib/NMAKEmakefile
===================================================================
--- trunk/srclib/zlib/NMAKEmakefile 2008-03-16 21:27:02 UTC (rev 1443)
+++ trunk/srclib/zlib/NMAKEmakefile 2008-03-16 21:29:21 UTC (rev 1444)
@@ -36,7 +36,7 @@
CFLAGS = -DZLIB_WINAPI -D_CRT_SECURE_NO_DEPRECATE $(CFLAGS)
!ENDIF
-!IF "$(CPU)" != "I386"
+!IF "$(CPU)" != "X86"
CFLAGS = -GS- $(CFLAGS)
!ENDIF
@@ -64,7 +64,7 @@
!IFDEF ZLIB_ASM
CFLAGS = -DASMV -DASMINF $(CFLAGS)
-!IF "$(CPU)" == "AMD64"
+!IF "$(CPU)" == "X64"
ASM_OBJECTS = \
$(WORKDIR)\inffas8664.obj \
$(WORKDIR)\gvmat64.obj \
@@ -106,7 +106,7 @@
{$(SRCDIR)}.c{$(WORKDIR)}.obj:
$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-!IF "$(CPU)" == "AMD64"
+!IF "$(CPU)" == "X64"
{$(SRCDIR)/contrib/masmx64}.c{$(WORKDIR)}.obj:
$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<