[fixed] stbtt build scripts.

diff --git a/extensions/stb-truetype/jni/build-linux32.xml b/extensions/stb-truetype/jni/build-linux32.xml
index ae97d11..d0cd42b 100644 (file)
--- a/extensions/stb-truetype/jni/build-linux32.xml
+++ b/extensions/stb-truetype/jni/build-linux32.xml
@@ -1,4 +1,4 @@
-<project name="test-Linux-32" basedir="." default="link">\r
+<project name="stbtruetype-Linux-32" basedir="." default="link">\r
        <!-- include the environment -->\r
        <property environment="env"/>   \r
        <!-- output directory for temporary object files -->\r
@@ -6,7 +6,7 @@
        <!-- output directory for the shared library -->\r
        <property name="libsDir" value="../libs/linux32" />\r
        <!-- the name of the shared library -->\r
-       <property name="libName" value="libtest.so"/>\r
+       <property name="libName" value="libstbtruetype.so"/>\r
        <!-- the jni header jniPlatform to use -->\r
        <property name="jniPlatform" value="linux"/>\r
        <!-- the compilerPrefix for the C & C++ compilers -->\r

diff --git a/extensions/stb-truetype/jni/build-linux64.xml b/extensions/stb-truetype/jni/build-linux64.xml
index 44b2e9d..25ce0e6 100644 (file)
--- a/extensions/stb-truetype/jni/build-linux64.xml
+++ b/extensions/stb-truetype/jni/build-linux64.xml
@@ -1,4 +1,4 @@
-<project name="test-Linux-64" basedir="." default="link">\r
+<project name="stbtruetype-Linux-64" basedir="." default="link">\r
        <!-- include the environment -->\r
        <property environment="env"/>   \r
        <!-- output directory for temporary object files -->\r
@@ -6,7 +6,7 @@
        <!-- output directory for the shared library -->\r
        <property name="libsDir" value="../libs/linux64" />\r
        <!-- the name of the shared library -->\r
-       <property name="libName" value="libtest64.so"/>\r
+       <property name="libName" value="libstbtruetype64.so"/>\r
        <!-- the jni header jniPlatform to use -->\r
        <property name="jniPlatform" value="linux"/>\r
        <!-- the compilerPrefix for the C & C++ compilers -->\r

diff --git a/extensions/stb-truetype/jni/build-windows32.xml b/extensions/stb-truetype/jni/build-windows32.xml
index bbb72c3..1e0998f 100644 (file)
--- a/extensions/stb-truetype/jni/build-windows32.xml
+++ b/extensions/stb-truetype/jni/build-windows32.xml
@@ -1,4 +1,4 @@
-<project name="test-Windows-32" basedir="." default="link">\r
+<project name="stbtruetype-Windows-32" basedir="." default="link">\r
        <!-- include the environment -->\r
        <property environment="env"/>   \r
        <!-- output directory for temporary object files -->\r
@@ -6,7 +6,7 @@
        <!-- output directory for the shared library -->\r
        <property name="libsDir" value="../libs/windows32" />\r
        <!-- the name of the shared library -->\r
-       <property name="libName" value="test.dll"/>\r
+       <property name="libName" value="stbtruetype.dll"/>\r
        <!-- the jni header jniPlatform to use -->\r
        <property name="jniPlatform" value="win32"/>\r
        <!-- the compilerPrefix for the C & C++ compilers -->\r

diff --git a/extensions/stb-truetype/jni/build-windows32home.xml b/extensions/stb-truetype/jni/build-windows32home.xml
index e784766..2c3bf0b 100644 (file)
--- a/extensions/stb-truetype/jni/build-windows32home.xml
+++ b/extensions/stb-truetype/jni/build-windows32home.xml
@@ -1,4 +1,4 @@
-<project name="test-Windows-32" basedir="." default="link">\r
+<project name="stbtruetype-Windows-32" basedir="." default="link">\r
        <!-- include the environment -->\r
        <property environment="env"/>   \r
        <!-- output directory for temporary object files -->\r
@@ -6,7 +6,7 @@
        <!-- output directory for the shared library -->\r
        <property name="libsDir" value="../libs/windows32" />\r
        <!-- the name of the shared library -->\r
-       <property name="libName" value="test.dll"/>\r
+       <property name="libName" value="stbtruetype.dll"/>\r
        <!-- the jni header jniPlatform to use -->\r
        <property name="jniPlatform" value="win32"/>\r
        <!-- the compilerPrefix for the C & C++ compilers -->\r

diff --git a/extensions/stb-truetype/jni/build-windows64.xml b/extensions/stb-truetype/jni/build-windows64.xml
index 013ccf7..44414ef 100644 (file)
--- a/extensions/stb-truetype/jni/build-windows64.xml
+++ b/extensions/stb-truetype/jni/build-windows64.xml
@@ -1,4 +1,4 @@
-<project name="test-Windows-64" basedir="." default="link">\r
+<project name="stbtruetype-Windows-64" basedir="." default="link">\r
        <!-- include the environment -->\r
        <property environment="env"/>   \r
        <!-- output directory for temporary object files -->\r
@@ -6,7 +6,7 @@
        <!-- output directory for the shared library -->\r
        <property name="libsDir" value="../libs/windows64" />\r
        <!-- the name of the shared library -->\r
-       <property name="libName" value="test64.dll"/>\r
+       <property name="libName" value="stbtruetype64.dll"/>\r
        <!-- the jni header jniPlatform to use -->\r
        <property name="jniPlatform" value="win32"/>\r
        <!-- the compilerPrefix for the C & C++ compilers -->\r

diff --git a/extensions/stb-truetype/jni/build.xml b/extensions/stb-truetype/jni/build.xml
index beca97d..2cc46ed 100644 (file)
--- a/extensions/stb-truetype/jni/build.xml
+++ b/extensions/stb-truetype/jni/build.xml
@@ -1,4 +1,4 @@
-<project name="test-natives" basedir="." default="all">
+<project name="stbtruetype-natives" basedir="." default="all">
        <target name="clean">
                <ant antfile="build-windows32.xml" target="clean"/>
                <ant antfile="build-windows64.xml" target="clean"/>
@@ -16,8 +16,8 @@
        </target>
        
        <target name="pack-natives">
-               <jar destfile="../libs/test-natives.jar">
-                       <fileset dir="../libs/windows32" includes="test.dll"/>                  <fileset dir="../libs/windows64" includes="test64.dll"/>                        <fileset dir="../libs/linux32" includes="libtest.so"/>                  <fileset dir="../libs/linux64" includes="libtest64.so"/>
+               <jar destfile="../libs/stbtruetype-natives.jar">
+                       <fileset dir="../libs/windows32" includes="stbtruetype.dll"/>                   <fileset dir="../libs/windows64" includes="stbtruetype64.dll"/>                 <fileset dir="../libs/linux32" includes="libstbtruetype.so"/>                   <fileset dir="../libs/linux64" includes="libstbtruetype64.so"/>
                </jar>
        </target>