move apple.jar into core because it needs its own ThinkDifferent

benfry · benfry · commit d2205a97c8a4 · 2015-05-19T15:49:03.000-04:00
diff --git a/app/build.xml b/app/build.xml
@@ -35,8 +35,9 @@
 	   encoding="UTF-8" 
 	   includeAntRuntime="false" 
 	   classpath="../core/library/core.jar; 
-                      lib/ant.jar; lib/ant-launcher.jar; 
-                      lib/apple.jar; 
+                      ../core/apple.jar; 
+                      lib/ant.jar; 
+                      lib/ant-launcher.jar; 
                       lib/jna.jar"
 	   debug="on"
 	   nowarn="true"
diff --git a/core/apple.jar b/core/apple.jar
diff --git a/core/build.xml b/core/build.xml
@@ -32,14 +32,17 @@
     </condition>
     <!--<echo message="compiler is ${build.compiler}" />-->
 
+    <!-- link against apple.jar for the ThinkDifferent class -->
     <mkdir dir="bin" />
     <javac source="1.7"
 	   target="1.7"
 	   encoding="UTF-8"
 	   includeAntRuntime="false"
 	   debug="true"
 	   srcdir="src" destdir="bin"
-	   classpath="library/jogl-all.jar; library/gluegen-rt.jar"
+	   classpath="apple.jar; 
+                      library/jogl-all.jar; 
+                      library/gluegen-rt.jar"
 	   nowarn="true">
       <!-- kinda gross, but if not using the JDT, this just ignored anyway -->
       <compilerclasspath path="${jdt.jar}; ../java/mode/jdtCompilerAdapter.jar" />
