diff --git a/examples/effects/.classpath b/examples/effects/.classpath index 43bd144cf860aedddebc6b0492a623845407f94f..253bb2788028a84693dc5510159153b8a57307c8 100644 --- a/examples/effects/.classpath +++ b/examples/effects/.classpath @@ -2,7 +2,6 @@ <classpath> <classpathentry kind="src" path="src"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/> <classpathentry kind="lib" path="/com.amd.aparapi/dist/aparapi.jar" sourcepath="/com.amd.aparapi"> <attributes> <attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="com.amd.aparapi.jni/dist"/> diff --git a/examples/effects/build.xml b/examples/effects/build.xml index 7874c120ccc12021d7cc1b888ce698c7651cb452..af1f3367808f38d82c73831bb6059e3953e75cd4 100644 --- a/examples/effects/build.xml +++ b/examples/effects/build.xml @@ -2,43 +2,49 @@ <project name="effects" default="build" basedir="."> - <path id="compiler.class.path"> - <pathelement path="../../com.amd.aparapi/dist/aparapi.jar"/> - </path> - - <path id="runtime.class.path" cache="true"> - <path refid="compiler.class.path"/> - <pathelement path="${ant.project.name}.jar"/> - </path> - - <target name="build" depends="clean"> - <mkdir dir="classes"/> - <javac srcdir="src" destdir="classes" debug="on" includeantruntime="false"> - <classpath refid="compiler.class.path"/> - </javac> - <jar jarfile="${ant.project.name}.jar" basedir="classes"/> - </target> - - <target name="clean"> - <delete dir="classes"/> - <delete file="${ant.project.name}.jar"/> - </target> - - <target name="run-gpu" > - <java classname="com.amd.aparapi.examples.effects.Main" fork="true"> - <classpath refid="runtime.class.path"/> - <sysproperty key="java.library.path" path="..\..\com.amd.aparapi.jni\dist"/> - <sysproperty key="com.amd.aparapi.executionMode" value="GPU"/> - </java> - </target> - - <target name="run-jtp" > - <java classname="com.amd.aparapi.examples.effects.Main" fork="true"> - <classpath refid="runtime.class.path"/> - <sysproperty key="java.library.path" path="..\..\com.amd.aparapi.jni\dist"/> - <sysproperty key="com.amd.aparapi.executionMode" value="JTP"/> - </java> - </target> - <target name="run" depends="run-gpu"/> + <!-- Ideally this would be the latest version of Java but not everyone is going to have it installed --> + <!-- Additionally we want to avoid "Class not found: javac1.8" errors from old Ant versions (i.e. Eclipse) --> + <property name="build.compiler" value="javac1.7" /> + <property name="ant.build.javac.source" value="1.7" /> + <property name="ant.build.javac.target" value="1.7" /> + + <path id="compiler.class.path"> + <pathelement path="../../com.amd.aparapi/dist/aparapi.jar" /> + </path> + + <path id="runtime.class.path" cache="true"> + <path refid="compiler.class.path" /> + <pathelement path="${ant.project.name}.jar" /> + </path> + + <target name="build" depends="clean"> + <mkdir dir="classes" /> + <javac srcdir="src" destdir="classes" debug="on" includeantruntime="false"> + <classpath refid="compiler.class.path" /> + </javac> + <jar jarfile="${ant.project.name}.jar" basedir="classes" /> + </target> + + <target name="clean"> + <delete dir="classes" /> + <delete file="${ant.project.name}.jar" /> + </target> + + <target name="run-gpu"> + <java classname="com.amd.aparapi.examples.effects.Main" fork="true"> + <classpath refid="runtime.class.path" /> + <sysproperty key="java.library.path" path="..\..\com.amd.aparapi.jni\dist" /> + <sysproperty key="com.amd.aparapi.executionMode" value="GPU" /> + </java> + </target> + + <target name="run-jtp"> + <java classname="com.amd.aparapi.examples.effects.Main" fork="true"> + <classpath refid="runtime.class.path" /> + <sysproperty key="java.library.path" path="..\..\com.amd.aparapi.jni\dist" /> + <sysproperty key="com.amd.aparapi.executionMode" value="JTP" /> + </java> + </target> + <target name="run" depends="run-gpu" /> </project>