Merge pull request #14 from longbai/master

update some external libraries
rictic · Jan 12, 2014 · ddf0ffe · ddf0ffe
2 parents 70867b3 + fc0e055
commit ddf0ffe
Show file tree

Hide file tree

Showing 36 changed files with 12 additions and 14 deletions.
diff --git a/lib/core.jar b/lib/core.jar
diff --git a/lib/export.txt b/lib/export.txt
@@ -1,12 +1,10 @@
-# if you want to support more platforms, see the jogl web site to get
-# the natives libraries for the platform in question (i.e. linux-amd64). 
-# then, add it to the applet line for export. for applications, you'll
-# have to make the changes by hand, i.e. use the linux version of the
-# export, and modify its contents to include the necessary files for
-# your platform.
-
-application.macosx = opengl.jar, jogl.jar, libjogl.jnilib, libjogl_awt.jnilib, libjogl_cg.jnilib
-application.windows = opengl.jar, jogl.jar, jogl.dll, jogl_awt.dll, jogl_cg.dll
-application.linux = opengl.jar, jogl.jar, libjogl.so, libjogl_awt.so, libjogl_cg.so, libjogl_drihack.so
-
-applet = opengl.jar, jogl.jar, jogl-natives-linux-i586.jar, jogl-natives-macosx-ppc.jar, jogl-natives-macosx-universal.jar, jogl-natives-windows-i586.jar
+# If you want to support more platforms, visit jogamp.org to get the 
+# natives libraries for the platform in question (i.e. Solaris). 
+
+name = OpenGL
+
+application.macosx=core.jar,jogl-all.jar,gluegen-rt.jar,jogl-all-natives-macosx-universal.jar,gluegen-rt-natives-macosx-universal.jar
+application.windows32=core.jar,jogl-all.jar,gluegen-rt.jar,jogl-all-natives-windows-i586.jar,gluegen-rt-natives-windows-i586.jar
+application.windows64=core.jar,jogl-all.jar,gluegen-rt.jar,jogl-all-natives-windows-amd64.jar,gluegen-rt-natives-windows-amd64.jar
+application.linux32=core.jar,jogl-all.jar,gluegen-rt.jar,jogl-all-natives-linux-i586.jar,gluegen-rt-natives-linux-i586.jar
+application.linux64=core.jar,jogl-all.jar,gluegen-rt.jar,jogl-all-natives-linux-amd64.jar,gluegen-rt-natives-linux-amd64.jar
diff --git a/lib/gluegen-rt-natives-linux-amd64.jar b/lib/gluegen-rt-natives-linux-amd64.jar
diff --git a/lib/gluegen-rt-natives-linux-i586.jar b/lib/gluegen-rt-natives-linux-i586.jar
diff --git a/lib/gluegen-rt-natives-macosx-universal.jar b/lib/gluegen-rt-natives-macosx-universal.jar
diff --git a/lib/gluegen-rt-natives-windows-amd64.jar b/lib/gluegen-rt-natives-windows-amd64.jar
diff --git a/lib/gluegen-rt-natives-windows-i586.jar b/lib/gluegen-rt-natives-windows-i586.jar
diff --git a/lib/gluegen-rt.jar b/lib/gluegen-rt.jar
diff --git a/lib/jogl-all-natives-linux-amd64.jar b/lib/jogl-all-natives-linux-amd64.jar
diff --git a/lib/jogl-all-natives-linux-i586.jar b/lib/jogl-all-natives-linux-i586.jar
diff --git a/lib/jogl-all-natives-macosx-universal.jar b/lib/jogl-all-natives-macosx-universal.jar
diff --git a/lib/jogl-all-natives-windows-amd64.jar b/lib/jogl-all-natives-windows-amd64.jar
diff --git a/lib/jogl-all-natives-windows-i586.jar b/lib/jogl-all-natives-windows-i586.jar
diff --git a/lib/jogl-all.jar b/lib/jogl-all.jar
diff --git a/lib/jogl-natives-linux-i586.jar b/lib/jogl-natives-linux-i586.jar
diff --git a/lib/jogl-natives-macosx-ppc.jar b/lib/jogl-natives-macosx-ppc.jar
diff --git a/lib/jogl-natives-macosx-universal.jar b/lib/jogl-natives-macosx-universal.jar
diff --git a/lib/jogl-natives-windows-i586.jar b/lib/jogl-natives-windows-i586.jar
diff --git a/lib/jogl.dll b/lib/jogl.dll
diff --git a/lib/jogl.jar b/lib/jogl.jar
diff --git a/lib/jogl_awt.dll b/lib/jogl_awt.dll
diff --git a/lib/jogl_cg.dll b/lib/jogl_cg.dll
diff --git a/lib/libgluegen-rt.jnilib b/lib/libgluegen-rt.jnilib
diff --git a/lib/libjogl.jnilib b/lib/libjogl.jnilib
diff --git a/lib/libjogl.so b/lib/libjogl.so
diff --git a/lib/libjogl_awt.jnilib b/lib/libjogl_awt.jnilib
diff --git a/lib/libjogl_awt.so b/lib/libjogl_awt.so
diff --git a/lib/libjogl_cg.jnilib b/lib/libjogl_cg.jnilib
diff --git a/lib/libjogl_cg.so b/lib/libjogl_cg.so
diff --git a/lib/libjogl_drihack.so b/lib/libjogl_drihack.so
diff --git a/lib/linux-x86_64/libgluegen-rt.so b/lib/linux-x86_64/libgluegen-rt.so
diff --git a/lib/linux-x86_64/libjogl.so b/lib/linux-x86_64/libjogl.so
diff --git a/lib/linux-x86_64/libjogl_awt.so b/lib/linux-x86_64/libjogl_awt.so
diff --git a/lib/linux-x86_64/libjogl_cg.so b/lib/linux-x86_64/libjogl_cg.so
diff --git a/lib/opengl.jar b/lib/opengl.jar
diff --git a/src/code_swarm.java b/src/code_swarm.java
@@ -491,7 +491,7 @@ public void drawDate() {
     fill(fontColor, 255);
     String dateText = formatter.format(prevDate);
     textAlign(RIGHT, BASELINE);
-    textSize(font.size);
+    textSize(font.getSize());
     text(dateText, width - 3, height - (2 + textDescent()));
   }
 
@@ -534,7 +534,7 @@ public void drawLegend() {
     for (int i = 0; i < colorAssigner.tests.size(); i++) {
       ColorTest t = colorAssigner.tests.get(i);
       fill(t.c1, 200);
-      text(t.label, font.size, 3 + ((i + 1) * (font.size + 2)));
+      text(t.label, font.getSize(), 3 + ((i + 1) * (font.getSize() + 2)));
     }
   }