From ff9a41b2ed12e91f4f7663ec69a061200936785e Mon Sep 17 00:00:00 2001
From: Gary Frost <frost.gary@gmail.com>
Date: Thu, 23 Aug 2012 13:17:54 +0000
Subject: [PATCH] Remove build.properties file, which was confusing everyone.
Now build.xml has everything we need.
If you want to use mingw. Just modify the instructions at the top of build.xml
---
com.amd.aparapi.jni/build.properties | 46 ----------------------------
com.amd.aparapi.jni/build.xml | 31 ++++++++++++++++++-
2 files changed, 30 insertions(+), 47 deletions(-)
delete mode 100644 com.amd.aparapi.jni/build.properties
diff --git a/com.amd.aparapi.jni/build.properties b/com.amd.aparapi.jni/build.properties
deleted file mode 100644
index 6b3fdd38..00000000
--- a/com.amd.aparapi.jni/build.properties
+++ /dev/null
@@ -1,46 +0,0 @@
-
-###amd.app.dir{
-#
-# Set this to the location where the AMD APP SDK is installed.
-# JNI compile process needs this so we can locate the OpenCL libraries and headers
-#
-# Usually "C:\\Program Files\\AMD APP" if you took installer defaults when installing "AMD APP SDK" on 32 bit Windows
-#amd.app.sdk.dir=C:\\Program Files\\AMD APP
-#
-# Or "C:\\Program Files (x86)\\AMD APP" if you took installer defaults when installing "AMD APP SDK" on 64 bit Windows
-#amd.app.sdk.dir=C:\\Program Files (x86)\\AMD APP
-#
-# Will need to be set to wherever you install the SDK on Linux
-#amd.app.sdk.dir=/home/gfrost/opencl/ati-stream-sdk-v2.3-lnx64
-#amd.app.sdk.dir=/opt/AMDAPP
-#
-###amd.app.dir}
-###Windows{
-#
-# We need to set up either visual studio or MinGW compiler info
-#
-###Windows Visual Studio{
-# We need to know where Visual Studio is installed
-#msvc.dir=C:\\Program Files\\Microsoft Visual Studio 9.0
-#msvc.dir=C:\\Program Files\\Microsoft Visual Studio 10.0
-#
-#msvc.dir=c:\\Program Files (x86)\\Microsoft Visual Studio 10.0
-#
-# We need to know where the microsoft SDK was installed so we can configure include and lib paths
-#msvc.sdk.dir=C:\\Program Files\\Microsoft SDKs\\Windows\\v7.1
-#msvc.sdk.dir=C:\\Program Files\\Microsoft SDKs\\Windows\\v7.0A
-#msvc.sdk.dir=C:\\Program Files\\Microsoft SDKs\\Windows\\v7.0
-#msvc.sdk.dir=C:\\Program Files\\Microsoft SDKs\\Windows\\v6.0A
-#
-###Windows Visual Studio}
-
-###Windows MinGW{
-#
-# MinGW is simpler ;) we just need the install dir. At runtime you will need ${mingw.dir}/bin in your path!
-#mingw.dir=c:\\MinGW
-#
-#mingw.dir=c:\\devel\\MinGW
-#
-###Windows MinGW}
-
-###Windows}
diff --git a/com.amd.aparapi.jni/build.xml b/com.amd.aparapi.jni/build.xml
index 61f5bd16..990caf72 100644
--- a/com.amd.aparapi.jni/build.xml
+++ b/com.amd.aparapi.jni/build.xml
@@ -20,7 +20,8 @@ First consider editing the properties in build.properties
<property environment="env" />
<!-- we need env.PATH for msvc only -->
- <!--<property file="build.properties" />-->
+ <!-- uncomment this if you want to use mingw! -->
+ <!--<property name="mingw.dir" value="c:\\MinGW"/>-->
<target name="init">
<available property="win32.amd.app.sdk.exists" file="C:/Program Files/AMD APP" type="dir"/>
@@ -35,6 +36,7 @@ First consider editing the properties in build.properties
</and>
</condition>
+
<available property="win64.amd.app.sdk.exists" file="C:/Program Files (x86)/AMD APP" type="dir"/>
<condition property="amd.app.sdk.dir" value="C:/Program Files (x86)/AMD APP">
<and>
@@ -80,6 +82,9 @@ First consider editing the properties in build.properties
<not>
<isset property="msvc.dir" />
</not>
+ <not>
+ <isset property="mingw.dir" />
+ </not>
</and>
</condition>
@@ -97,6 +102,9 @@ First consider editing the properties in build.properties
<not>
<isset property="msvc.dir" />
</not>
+ <not>
+ <isset property="mingw.dir" />
+ </not>
</and>
</condition>
@@ -112,6 +120,9 @@ First consider editing the properties in build.properties
<not>
<isset property="msvc.dir" />
</not>
+ <not>
+ <isset property="mingw.dir" />
+ </not>
</and>
</condition>
@@ -127,6 +138,9 @@ First consider editing the properties in build.properties
<not>
<isset property="msvc.dir" />
</not>
+ <not>
+ <isset property="mingw.dir" />
+ </not>
</and>
</condition>
@@ -138,6 +152,9 @@ First consider editing the properties in build.properties
<not>
<isset property="msvc.sdk.dir" />
</not>
+ <not>
+ <isset property="mingw.dir" />
+ </not>
</and>
</condition>
@@ -149,6 +166,9 @@ First consider editing the properties in build.properties
<not>
<isset property="msvc.sdk.dir" />
</not>
+ <not>
+ <isset property="mingw.dir" />
+ </not>
</and>
</condition>
@@ -160,6 +180,9 @@ First consider editing the properties in build.properties
<not>
<isset property="msvc.sdk.dir" />
</not>
+ <not>
+ <isset property="mingw.dir" />
+ </not>
</and>
</condition>
@@ -171,6 +194,9 @@ First consider editing the properties in build.properties
<not>
<isset property="msvc.sdk.dir" />
</not>
+ <not>
+ <isset property="mingw.dir" />
+ </not>
</and>
</condition>
@@ -182,6 +208,9 @@ First consider editing the properties in build.properties
<not>
<isset property="msvc.sdk.dir" />
</not>
+ <not>
+ <isset property="mingw.dir" />
+ </not>
</and>
</condition>
--
GitLab