diff options
| -rw-r--r-- | make/build.xml | 2 | ||||
| -rw-r--r-- | src/jogl/classes/jogamp/graph/font/UbuntuFontLoader.java | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/make/build.xml b/make/build.xml index b2a3341f6..27f06ff51 100644 --- a/make/build.xml +++ b/make/build.xml @@ -112,6 +112,8 @@ <fileset dir="${build.graphui}" includes="*.jar" /> <fileset dir="${build.oculusvr}" includes="*.jar" erroronmissingdir="false"/> <!-- optional --> </copy> + <move todir="${jar}" + file="${jar}/atomic/jogl-fonts-p0.jar"/> <copy file="joglversion-all" tofile="${build}/manifest-all.mf" diff --git a/src/jogl/classes/jogamp/graph/font/UbuntuFontLoader.java b/src/jogl/classes/jogamp/graph/font/UbuntuFontLoader.java index 71d18b17e..46cd4cfab 100644 --- a/src/jogl/classes/jogamp/graph/font/UbuntuFontLoader.java +++ b/src/jogl/classes/jogamp/graph/font/UbuntuFontLoader.java @@ -49,7 +49,6 @@ public class UbuntuFontLoader implements FontSet { // FIXME: Add cache size to limit memory usage private static final IntObjectHashMap fontMap = new IntObjectHashMap(); - private static final Uri.Encoded jarSubDir = Uri.Encoded.cast("atomic/"); private static final Uri.Encoded jarName = Uri.Encoded.cast("jogl-fonts-p0.jar"); private static final String absFontPath = "jogamp/graph/font/fonts/ubuntu/" ; @@ -138,7 +137,7 @@ public class UbuntuFontLoader implements FontSet { Platform.initSingleton(); if( TempJarCache.isInitialized(false) ) { try { - final Uri uri = JarUtil.getRelativeOf(UbuntuFontLoader.class, jarSubDir, jarName); + final Uri uri = JarUtil.getRelativeOf(UbuntuFontLoader.class, null, jarName); final Exception e0 = SecurityUtil.doPrivileged(new PrivilegedAction<Exception>() { @Override public Exception run() { |