and reverted build script changes again...

diff --git a/extensions/gdx-audio/jni/build-linux32.xml b/extensions/gdx-audio/jni/build-linux32.xml
index 1005696..85aeb04 100644 (file)
--- a/extensions/gdx-audio/jni/build-linux32.xml
+++ b/extensions/gdx-audio/jni/build-linux32.xml
@@ -65,7 +65,7 @@
 \r
        <!-- define linker and options -->\r
        <property name="linker" value="${compilerPrefix}g++"/>\r
-       <property name="linker-opts" value="-shared -m32 -static-libgcc -static-libstdc++"/>\r
+       <property name="linker-opts" value="-shared -m32"/>\r
        \r
        <!-- cleans the build directory, removes all object files and shared libs -->\r
        <target name="clean">\r

diff --git a/extensions/gdx-audio/jni/build-linux64.xml b/extensions/gdx-audio/jni/build-linux64.xml
index f761194..04b098b 100644 (file)
--- a/extensions/gdx-audio/jni/build-linux64.xml
+++ b/extensions/gdx-audio/jni/build-linux64.xml
@@ -65,7 +65,7 @@
 \r
        <!-- define linker and options -->\r
        <property name="linker" value="${compilerPrefix}g++"/>\r
-       <property name="linker-opts" value="-shared -m64 -static-libgcc -static-libstdc++"/>\r
+       <property name="linker-opts" value="-shared -m64"/>\r
        \r
        <!-- cleans the build directory, removes all object files and shared libs -->\r
        <target name="clean">\r

diff --git a/extensions/gdx-freetype/jni/build-linux32.xml b/extensions/gdx-freetype/jni/build-linux32.xml
index f7a2b29..fe47f7a 100644 (file)
--- a/extensions/gdx-freetype/jni/build-linux32.xml
+++ b/extensions/gdx-freetype/jni/build-linux32.xml
@@ -77,7 +77,7 @@
 \r
        <!-- define linker and options -->\r
        <property name="linker" value="${compilerPrefix}g++"/>\r
-       <property name="linker-opts" value="-shared -m32 -static-libgcc -static-libstdc++"/>\r
+       <property name="linker-opts" value="-shared -m32"/>\r
        \r
        <!-- cleans the build directory, removes all object files and shared libs -->\r
        <target name="clean">\r

diff --git a/extensions/gdx-freetype/jni/build-linux64.xml b/extensions/gdx-freetype/jni/build-linux64.xml
index 4d01f32..b434aaa 100644 (file)
--- a/extensions/gdx-freetype/jni/build-linux64.xml
+++ b/extensions/gdx-freetype/jni/build-linux64.xml
@@ -77,7 +77,7 @@
 \r
        <!-- define linker and options -->\r
        <property name="linker" value="${compilerPrefix}g++"/>\r
-       <property name="linker-opts" value="-shared -m64 -static-libgcc -static-libstdc++"/>\r
+       <property name="linker-opts" value="-shared -m64"/>\r
        \r
        <!-- cleans the build directory, removes all object files and shared libs -->\r
        <target name="clean">\r

diff --git a/extensions/gdx-image/jni/build-linux32.xml b/extensions/gdx-image/jni/build-linux32.xml
index abd62c7..9648512 100644 (file)
--- a/extensions/gdx-image/jni/build-linux32.xml
+++ b/extensions/gdx-image/jni/build-linux32.xml
@@ -34,7 +34,7 @@
 \r
        <!-- define linker and options -->\r
        <property name="linker" value="${compilerPrefix}g++"/>\r
-       <property name="linker-opts" value="-shared -m32 -static-libgcc -static-libstdc++"/>\r
+       <property name="linker-opts" value="-shared -m32"/>\r
        \r
        <!-- cleans the build directory, removes all object files and shared libs -->\r
        <target name="clean">\r

diff --git a/extensions/gdx-image/jni/build-linux64.xml b/extensions/gdx-image/jni/build-linux64.xml
index 0297104..fe9759b 100644 (file)
--- a/extensions/gdx-image/jni/build-linux64.xml
+++ b/extensions/gdx-image/jni/build-linux64.xml
@@ -34,7 +34,7 @@
 \r
        <!-- define linker and options -->\r
        <property name="linker" value="${compilerPrefix}g++"/>\r
-       <property name="linker-opts" value="-shared -m64 -static-libgcc -static-libstdc++"/>\r
+       <property name="linker-opts" value="-shared -m64"/>\r
        \r
        <!-- cleans the build directory, removes all object files and shared libs -->\r
        <target name="clean">\r

diff --git a/extensions/gdx-jnigen/src/com/badlogic/gdx/jnigen/BuildTarget.java b/extensions/gdx-jnigen/src/com/badlogic/gdx/jnigen/BuildTarget.java
index b8a4c3d..c2db839 100644 (file)
--- a/extensions/gdx-jnigen/src/com/badlogic/gdx/jnigen/BuildTarget.java
+++ b/extensions/gdx-jnigen/src/com/badlogic/gdx/jnigen/BuildTarget.java
@@ -104,14 +104,14 @@ public class BuildTarget {
                        // Linux 32-Bit\r
                        return new BuildTarget(TargetOs.Linux, false, new String[] {"**/*.c"}, new String[0], new String[] {"**/*.cpp"},\r
                                new String[0], new String[0], "", "-c -Wall -O2 -mfpmath=sse -msse -fmessage-length=0 -m32 -fPIC",\r
-                               "-c -Wall -O2 -mfpmath=sse -msse -fmessage-length=0 -m32 -fPIC", "-shared -m32 -static-libgcc -static-libstdc++");\r
+                               "-c -Wall -O2 -mfpmath=sse -msse -fmessage-length=0 -m32 -fPIC", "-shared -m32");\r
                }\r
 \r
                if (type == TargetOs.Linux && is64Bit) {\r
                        // Linux 64-Bit\r
                        return new BuildTarget(TargetOs.Linux, true, new String[] {"**/*.c"}, new String[0], new String[] {"**/*.cpp"},\r
                                new String[0], new String[0], "", "-c -Wall -O2 -mfpmath=sse -msse -fmessage-length=0 -m64 -fPIC",\r
-                               "-c -Wall -O2 -mfpmath=sse -msse -fmessage-length=0 -m64 -fPIC", "-shared -m64 -static-libgcc -static-libstdc++");\r
+                               "-c -Wall -O2 -mfpmath=sse -msse -fmessage-length=0 -m64 -fPIC", "-shared -m64");\r
                }\r
 \r
                if (type == TargetOs.MacOsX) {\r

diff --git a/gdx/jni/build-linux32.xml b/gdx/jni/build-linux32.xml
index 4bccb85..0a544fb 100644 (file)
--- a/gdx/jni/build-linux32.xml
+++ b/gdx/jni/build-linux32.xml
@@ -34,7 +34,7 @@
 \r
        <!-- define linker and options -->\r
        <property name="linker" value="${compilerPrefix}g++"/>\r
-       <property name="linker-opts" value="-shared -m32 -static-libgcc -static-libstdc++"/>\r
+       <property name="linker-opts" value="-shared -m32"/>\r
        \r
        <!-- cleans the build directory, removes all object files and shared libs -->\r
        <target name="clean">\r

diff --git a/gdx/jni/build-linux64.xml b/gdx/jni/build-linux64.xml
index f138216..74eb827 100644 (file)
--- a/gdx/jni/build-linux64.xml
+++ b/gdx/jni/build-linux64.xml
@@ -34,7 +34,7 @@
 \r
        <!-- define linker and options -->\r
        <property name="linker" value="${compilerPrefix}g++"/>\r
-       <property name="linker-opts" value="-shared -m64 -static-libgcc -static-libstdc++"/>\r
+       <property name="linker-opts" value="-shared -m64"/>\r
        \r
        <!-- cleans the build directory, removes all object files and shared libs -->\r
        <target name="clean">\r