[Jboss-svn-commits] JBL Code SVN: r4370 - in labs/jbossweb/trunk/src/share/native: . build

[<jbo...@li...>]

Author: mla...@jb...
Date: 2006-05-23 05:53:11 -0400 (Tue, 23 May 2006)
New Revision: 4370

Modified:
   labs/jbossweb/trunk/src/share/native/NMAKEmakefile
   labs/jbossweb/trunk/src/share/native/build/NMAKEcommon.inc
Log:
Fix Windows/IA64 build

Modified: labs/jbossweb/trunk/src/share/native/NMAKEmakefile
===================================================================
--- labs/jbossweb/trunk/src/share/native/NMAKEmakefile	2006-05-23 09:52:41 UTC (rev 4369)
+++ labs/jbossweb/trunk/src/share/native/NMAKEmakefile	2006-05-23 09:53:11 UTC (rev 4370)
@@ -48,9 +48,9 @@
 
 INCLUDES = -I$(SRCDIR)/include $(JAVA_INCLUDES)
 
-APRVER = "1.2.7"
-SSLVER = "0.9.8b"
-ZIPVER = "1.2.3"
+APRVER = 1.2.7
+SSLVER = 0.9.8b
+ZIPVER = 1.2.3
 
 !IFNDEF WITH_APR
 WITH_APR = srclib/apr-$(APRVER)

Modified: labs/jbossweb/trunk/src/share/native/build/NMAKEcommon.inc
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/NMAKEcommon.inc	2006-05-23 09:52:41 UTC (rev 4369)
+++ labs/jbossweb/trunk/src/share/native/build/NMAKEcommon.inc	2006-05-23 09:53:11 UTC (rev 4370)
@@ -103,7 +103,7 @@
 !ENDIF
 
 !IF !DEFINED(WINVER) || "$(WINVER)" == ""
-WINVER=WINNT
+WINVER=WIN2003
 !ENDIF
 
 
@@ -166,12 +166,16 @@
 !ELSEIF "$(CPU)" == "AMD64"
 CPU_CFLAGS = -D_AMD64_=1 -DWIN64 -D_WIN64 -Wp64 -W3 /FIPRE64PRA.H
 !ELSEIF "$(CPU)" == "IA64"
-CPU_CFLAGS = -D_IA64_=1 -DWIN64 -D_WIN64 -Wp64 -W3 -Ap64 /FIPRE64PRA.H
+CPU_CFLAGS = -D_IA64_=1 -DWIN64 -D_WIN64 -Wp64 -W3 /FIPRE64PRA.H
 !ENDIF
 
 !IF "$(BUILD)" == "RELEASE"
+!IF "$(CPU)" == "I386"
 OPT_CFLAGS = -O2 -Ob2 -Oy- -Zi -DNDEBUG
 !ELSE
+OPT_CFLAGS = -O2 -Ob2 -Zi -DNDEBUG
+!ENDIF
+!ELSE
 OPT_CFLAGS = -Od -Zi -DDEBUG -D_DEBUG
 !ENDIF