From 6a15d8c79076b5bf1ef3cf0ef0a504b3677dacdb Mon Sep 17 00:00:00 2001 From: kytv Date: Fri, 30 Sep 2011 16:52:12 +0000 Subject: [PATCH] update notes about compiling the wrapper in x86_64 Windows --- installer/lib/wrapper/win64/README-x64-win.txt | 9 +++++++-- installer/lib/wrapper/win64/x64-win.patch | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/installer/lib/wrapper/win64/README-x64-win.txt b/installer/lib/wrapper/win64/README-x64-win.txt index 086e57d67b..91c67de703 100644 --- a/installer/lib/wrapper/win64/README-x64-win.txt +++ b/installer/lib/wrapper/win64/README-x64-win.txt @@ -1,5 +1,10 @@ Changes will probably be needed for newer versions than 3.5.12. To use the patch in this directory, copy Makefile-windows-x86-32.nmake to -Makefile-windows-x86-64.nmake then "patch < x64-win.patch". Compiles cleanly -using VS2010. +Makefile-windows-x86-64.nmake then "patch < x64-win.patch". + +Configure your environment per the apache-ant instructions (i.e., set ANT_HOME +and JAVA_HOME). Then in the wrapper source directory, run build64.bat. + +Compiled in VS2010SP1 after creating %USERPROFILE%\.ant.properties with: +vcvars.bat="C:\\Program Files (x86)\\Microsoft Visual Studio 10.0\\VC\\bin\\amd64\\vcvars64.bat". diff --git a/installer/lib/wrapper/win64/x64-win.patch b/installer/lib/wrapper/win64/x64-win.patch index 0ceac6ea4a..2194801131 100644 --- a/installer/lib/wrapper/win64/x64-win.patch +++ b/installer/lib/wrapper/win64/x64-win.patch @@ -1,4 +1,4 @@ ---- Makefile-windows-x86-32.nmake 2011-09-29 20:34:25.447939000 +0000 +--- Makefile-windows-x86-64.nmake 2011-09-29 20:34:25.447939000 +0000 +++ Makefile-windows-x86-64.nmake 2011-09-29 20:51:57.297170000 +0000 @@ -9,19 +9,19 @@