diff options
| author | Sven Gothel <[email protected]> | 2020-01-02 07:31:48 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2020-01-02 07:31:48 +0100 |
| commit | b23ff7f7c8d4f27e9bbed0ffd0cff3f80ea50f15 (patch) | |
| tree | 90a7c819c01123ee8f54552a6e578d63df5c62f0 | |
| parent | ddeb3d97ac0911271753a58c077692871b4b4531 (diff) | |
Depend on jogl-all-noawt.jar instead of jogl-all.jar, allowing mobile device w/o AWT (iOS)
| -rw-r--r-- | make/build-test.xml | 6 | ||||
| -rw-r--r-- | make/build.xml | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/make/build-test.xml b/make/build-test.xml index fc2938ad..d19b7002 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -78,7 +78,7 @@ <property name="jocl-test.jar" value="${build}/jar/jocl-test.jar" /> <property name="obj.all.paths" value="${gluegen.build}/obj${path.separator}${jogl.build}/lib${path.separator}${obj}${path.separator}lib/${os.and.arch}"/> - <property name="classpath.test" value="${junit.jar}${path.separator}${gluegen-rt.jar}${path.separator}${jogl-all.jar}${path.separator}${jocl.jar}${path.separator}${jocl-test.jar}"/> + <property name="classpath.test" value="${junit.jar}${path.separator}${gluegen-rt.jar}${path.separator}${jogl-all-noawt.jar}${path.separator}${jocl.jar}${path.separator}${jocl-test.jar}"/> <property name="classpath.test.remote" value="${junit.jar}${path.separator}${env.TARGET_ANT_HOME}/lib/ant.jar${path.separator}${env.TARGET_ANT_HOME}/lib/ant-junit.jar${path.separator}${gluegen-rt.jar}${path.separator}${jocl.jar}${path.separator}${jocl-test.jar}"/> <property name="test.archive.name" value="${archive.name}-test-results-${build.node.name}"/> @@ -94,7 +94,7 @@ fork="yes" includeantruntime="false" srcdir="${src.test}" - classpath="${gluegen-rt.jar};${jocl.jar};${junit.jar};${jogl-all.jar}" + classpath="${gluegen-rt.jar};${jocl.jar};${junit.jar};${jogl-all-noawt.jar}" memoryMaximumSize="${javac.memorymax}" encoding="UTF-8" source="${target.sourcelevel}" @@ -174,7 +174,7 @@ version.name="${jogamp.version}"> <d8-classpaths> <arg line="--classpath ${gluegen-rt-android.jar}"/> - <arg line="--classpath ${jogl-all.jar}"/> + <arg line="--classpath ${jogl-all-noawt.jar}"/> <arg line="--classpath ${jocl.jar}"/> <arg line="--classpath ${junit.jar}"/> </d8-classpaths> diff --git a/make/build.xml b/make/build.xml index c0af5465..7cf097f0 100644 --- a/make/build.xml +++ b/make/build.xml @@ -110,7 +110,7 @@ <property name="jogl.root" value="${project.root}/../jogl" /> <property name="jogl.build" value="${jogl.root}/${rootrel.build}" /> - <property name="jogl-all.jar" value="${jogl.build}/jar/jogl-all.jar" /> + <property name="jogl-all-noawt.jar" value="${jogl.build}/jar/jogl-all-noawt.jar" /> </target> <target name="init.android" if="android-jars.available" > @@ -119,7 +119,7 @@ <path id="javac.android.classpath"> <pathelement location="${android-min.jar}"/> <pathelement location="${gluegen-rt-android.jar}" /> - <pathelement location="${jogl-all.jar}" /> + <pathelement location="${jogl-all-noawt.jar}" /> </path> </target> @@ -161,7 +161,7 @@ <path id="javac.classpath"> <pathelement location="${gluegen.jar}" /> - <pathelement location="${jogl-all.jar}" /> + <pathelement location="${jogl-all-noawt.jar}" /> </path> <property name="config" value="${project.root}/make/config" /> @@ -659,7 +659,7 @@ version.name="${jogamp.version}"> <d8-classpaths> <arg line="--classpath ${gluegen-rt-android.jar}"/> - <arg line="--classpath ${jogl-all.jar}"/> + <arg line="--classpath ${jogl-all-noawt.jar}"/> </d8-classpaths> </aapt.signed> </target> |