Depend on jogl-all-noawt.jar instead of jogl-all.jar, allowing mobile…

… device w/o AWT (iOS)
sgothel · Jan 2, 2020 · b23ff7f · b23ff7f
1 parent ddeb3d9
commit b23ff7f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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>