Author: mturk
Date: Mon Sep 27 11:10:57 2010
New Revision: 1001670
URL: http://svn.apache.org/viewvc?rev=1001670&view=rev
Log:
Handle some of the possible variants from the PROCESSOR_ARCHITECTURE environment
Modified:
commons/proper/daemon/trunk/src/native/windows/include/Makefile.inc
Modified: commons/proper/daemon/trunk/src/native/windows/include/Makefile.inc
URL:
http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/include/Makefile.inc?rev=1001670&r1=1001669&r2=1001670&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/windows/include/Makefile.inc
(original)
+++ commons/proper/daemon/trunk/src/native/windows/include/Makefile.inc Mon Sep
27 11:10:57 2010
@@ -103,17 +103,24 @@ CPU=X64
!IF "$(BUILD_CPU)" == "ia64" || "$(BUILD_CPU)" == "i64"
CPU=I64
!ENDIF
-!ENDIF
-# Figure out CPU from the current host
-!IF !DEFINED(CPU) || "$(CPU)" == ""
+!ELSE
!IF "$(PROCESSOR_ARCHITECTURE)" == ""
!IF "$(PROCESSOR_ARCHITEW6432)" == ""
-CPU=X86
+BUILD_CPU=X86
!ELSE
-CPU=$(PROCESSOR_ARCHITEW6432)
+BUILD_CPU=$(PROCESSOR_ARCHITEW6432)
!ENDIF
!ELSE
-CPU=$(PROCESSOR_ARCHITECTURE)
+BUILD_CPU=$(PROCESSOR_ARCHITECTURE)
+!ENDIF
+!IF "$(BUILD_CPU)" == "i386" || "$(BUILD_CPU)" == "x86" || "$(BUILD_CPU)" ==
"i686"
+CPU=X86
+!ENDIF
+!IF "$(BUILD_CPU)" == "amd64" || "$(BUILD_CPU)" == "x86_64" || "$(BUILD_CPU)"
== "x64"
+CPU=X64
+!ENDIF
+!IF "$(BUILD_CPU)" == "ia64" || "$(BUILD_CPU)" == "i64"
+CPU=I64
!ENDIF
!ENDIF
