Index: build/build.bat
===================================================================
--- build/build.bat (revision 509531)
+++ build/build.bat (working copy)
@@ -79,10 +79,17 @@
)
:CONFIG
+IF "%COMPILER_CFG_SCRIPT%" == "EM64T" (
+ ECHO ON
+ CALL "c:\Program Files (x86)\Microsoft Visual Studio 8\VC\vcvarsall.bat" amd64 %COMPILER_CFG_ARG%
+ @ECHO OFF
+ GOTO WO_CONFIG
+)
ECHO ON
CALL "%COMPILER_CFG_SCRIPT%" %COMPILER_CFG_ARG%
@ECHO OFF
+:WO_CONFIG
IF NOT %ERRORLEVEL% == 0 (
ECHO *
ECHO * Failed to call C compiler configuration script:
@@ -90,7 +97,6 @@
ECHO *
GOTO ERROR
)
-
REM ================================================
REM Check JAVA_HOME & ANT_HOME
REM ================================================
@@ -142,3 +148,4 @@
EXIT /B 1
:THEEND
+
Index: build/make/setup.xml
===================================================================
--- build/make/setup.xml (revision 509531)
+++ build/make/setup.xml (working copy)
@@ -102,6 +102,7 @@
+
@@ -191,7 +192,15 @@
-
+
+
+
+
+
+
+
+
+
Index: build/make/components/vm/em.xml
===================================================================
--- build/make/components/vm/em.xml (revision 509531)
+++ build/make/components/vm/em.xml (working copy)
@@ -71,6 +71,12 @@
+
+
+
+
Index: build/make/components/vm/vmcore.xml
===================================================================
--- build/make/components/vm/vmcore.xml (revision 509531)
+++ build/make/components/vm/vmcore.xml (working copy)
@@ -323,6 +323,7 @@
+
+
@@ -308,8 +309,15 @@
+
+
Index: build/make/components/extra/zlib.xml
===================================================================
--- build/make/components/extra/zlib.xml (revision 509531)
+++ build/make/components/extra/zlib.xml (working copy)
@@ -35,14 +35,19 @@
-
+
+
+
+
+
-
-
+
Index: build/make/build_component.xsl
===================================================================
--- build/make/build_component.xsl (revision 509531)
+++ build/make/build_component.xsl (working copy)
@@ -30,32 +30,62 @@
-
+
+ libname
+
-
+
+ includes
+
-
+
+ src
+
-
+
+ libdir
+
-
+
+ jardir
+
-
+
+ jarname
+
+
+
+
+
+
+ .
+
+
+
+ ${
+
+ }
+
+
+
+
+
+
Index: build/make/win.properties
===================================================================
--- build/make/win.properties (revision 509531)
+++ build/make/win.properties (working copy)
@@ -47,6 +47,7 @@
# ZLIB, version 1.2.1 or above
# http://www.zlib.net/
remote.ZLIB.archive=http://www.zlib.net/zlib123-dll.zip
+remote.ZLIB-x86_64.archive=http://issues.apache.org/jira/secure/attachment/12351498/zlib-x86_64-dll.zip
CLASSLIB_HOME=../../../classlib/trunk/
Index: build/make/targets/common_vm.xml
===================================================================
--- build/make/targets/common_vm.xml (revision 509531)
+++ build/make/targets/common_vm.xml (working copy)
@@ -78,7 +78,13 @@
-
+
+
+
@@ -203,11 +209,13 @@
+
+