From a454ef6cd04d48fd24e184033dd619e32a92c470 Mon Sep 17 00:00:00 2001
From: Gary Frost <frost.gary@gmail.com>
Date: Wed, 16 Nov 2011 16:33:26 +0000
Subject: [PATCH] Simpified microsoft build into one invocation of cl.exe.
---
com.amd.aparapi.jni/build.xml | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/com.amd.aparapi.jni/build.xml b/com.amd.aparapi.jni/build.xml
index 55c4a9db..f9a3529a 100644
--- a/com.amd.aparapi.jni/build.xml
+++ b/com.amd.aparapi.jni/build.xml
@@ -193,7 +193,6 @@ You should not have to edit this file. First consider editing the properties in
</or>
</condition>
- <property name="cl" value="${msvc.dir}\vc\bin\${optional.amd64.subdir}cl.exe" />
<available file="${msvc.dir}\vc\bin\${optional.amd64.subdir}cl.exe" type="file" property="cl.exists" />
@@ -314,7 +313,7 @@ You should not have to edit this file. First consider editing the properties in
<target name="msvc" if="use.msvc">
- <exec executable="${cl}">
+ <exec executable="${msvc.dir}\vc\bin\${optional.amd64.subdir}cl.exe">
<env key="PATH" path="${env.PATH};${msvc.dir}\\Common7\\IDE" />
<arg value="/nologo" />
<arg value="/TP" />
@@ -325,14 +324,8 @@ You should not have to edit this file. First consider editing the properties in
<arg value="/I${java.home}\..\include\win32" />
<arg value="/Iinclude" />
<arg value="/I${amd.app.sdk.dir}\include" />
- <arg value="/c" />
<arg value="src\cpp\aparapi.cpp" />
- </exec>
- <exec executable="${cl}">
- <env key="PATH" path="${env.PATH};${msvc.dir}\\Common7\\IDE" />
- <arg value="/nologo" />
<arg value="/LD" />
- <arg value="aparapi.obj" />
<arg value="/link" />
<arg value="/libpath:${msvc.dir}\vc\lib\${optional.amd64.subdir}" />
<arg value="/libpath:${msvc.sdk.dir}\lib\${optional.x64.subdir}" />
--
GitLab