summaryrefslogtreecommitdiffstats
path: root/build.xml
diff options
context:
space:
mode:
authorMichael Bien <[email protected]>2009-12-02 14:49:41 +0100
committerMichael Bien <[email protected]>2009-12-02 14:49:41 +0100
commit72203a5d1f8896463ded10d1b21ca116621d1900 (patch)
tree93472cac4c61381ea9cdc48bbe97a59b2cd6f64b /build.xml
parent7c7f5070dcbcc37afe36a4744161157cac49997c (diff)
fixed gcc setup on mac.
updated native taglet toc url. fixed small bug in cl char[] -> String conversion.
Diffstat (limited to 'build.xml')
-rw-r--r--build.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/build.xml b/build.xml
index e56b4239..5d69536f 100644
--- a/build.xml
+++ b/build.xml
@@ -19,8 +19,8 @@
<target name="-pre-compile" depends="prepare-build,preprocess-headers">
<path id="gluegen.classpath">
- <pathelement location="${gluegen.root}/build/gluegen.jar" />
- <pathelement location="${gluegen.root}/build/antlr-2.7.7.jar" />
+ <pathelement location="${file.reference.gluegen.jar}" />
+ <pathelement location="${antlr.jar}" />
</path>
<taskdef name="gluegen" classname="com.sun.gluegen.ant.GlueGenTask" classpathref="gluegen.classpath" />
@@ -62,7 +62,7 @@
</target>
- <target name="prepare-build">
+ <target name="prepare-build" depends="gluegen.properties.load.user">
<property name="headers.orig" value="${basedir}/resources/includes/CL_orig" />
@@ -155,7 +155,7 @@
<syslibset dir="C:/NVIDIAComputingSDK/OpenCL/common/lib/Win32" libs="OpenCL"/>
</linker>
- <linker id="linker.cfg.macosx.jocl">
+ <linker id="linker.cfg.macosx.jocl" extends="linker.cfg.macosx">
<linkerarg value="-framework" />
<linkerarg value="OpenCL" />
</linker>