diff options
| -rwxr-xr-x | make/build.xml | 24 | ||||
| -rwxr-xr-x | make/scripts/make.joal.all.linux-x86.sh (renamed from make/scripts/make.joal.all.linux-i586.sh) | 12 | ||||
| m--------- | openal-soft | 0 |
3 files changed, 24 insertions, 12 deletions
diff --git a/make/build.xml b/make/build.xml index e01c148..f326ea0 100755 --- a/make/build.xml +++ b/make/build.xml @@ -431,6 +431,10 @@ output.lib.name="joal" linker.cfg.id="${linker.cfg.id.base}"/> + <antcall target="gluegen.cpptasks.striplibs" inheritRefs="true"> + <param name="libdir" value="../${rootrel.build}/obj"/> + </antcall> + <!-- Create Java Web Start jar file from built file --> <jar destfile="${build}/joal-natives-${os.and.arch}.jar"> <fileset dir="../${rootrel.build}/obj"> @@ -442,7 +446,7 @@ </jar> </target> - <target name="c.build.openal.soft.android" if="isAndroid"> + <target name="c.build.openal.soft.android" if="isAndroid" unless="c.build.openal.soft.done"> <property name="c.build.openal.soft.done" value="true" /> <mkdir dir="${build}/openal-soft" /> <exec dir="${build}/openal-soft" executable="cmake" logError="true" failonerror="false" failifexecutionfails="false"> @@ -456,7 +460,7 @@ <exec dir="${build}/openal-soft" executable="make" logError="true" failonerror="false" failifexecutionfails="false" /> </target> - <target name="c.build.openal.soft.windows" if="isWindows"> + <target name="c.build.openal.soft.windows" if="isWindows" unless="c.build.openal.soft.done"> <property name="c.build.openal.soft.done" value="true" /> <mkdir dir="${build}/openal-soft" /> <exec dir="${build}/openal-soft" executable="cmake" logError="true" failonerror="false" failifexecutionfails="false"> @@ -489,10 +493,22 @@ <delete dir="openal-soft-1.15.1-bin" /> </target> - <target name="c.build.openal.soft.default" unless="c.build.openal.soft.done"> + <target name="c.build.openal.soft.gcc.x86_32" if="isI386" unless="c.build.openal.soft.done"> + <property name="c.build.openal.soft.done" value="true" /> + <mkdir dir="${build}/openal-soft" /> + <exec dir="${build}/openal-soft" executable="cmake" logError="true" failonerror="false" failifexecutionfails="false"> + <arg value="../../openal-soft"/> + <arg value="-DCMAKE_TOOLCHAIN_FILE=../../openal-soft/cmake/toolchain.gcc-x86_32.cmake"/> + </exec> + <exec dir="${build}/openal-soft" executable="make" logError="true" failonerror="false" failifexecutionfails="false" /> + </target> + + <target name="c.build.openal.soft.gcc.default" unless="c.build.openal.soft.done"> + <property name="c.build.openal.soft.done" value="true" /> <mkdir dir="${build}/openal-soft" /> <exec dir="${build}/openal-soft" executable="cmake" logError="true" failonerror="false" failifexecutionfails="false"> <arg value="../../openal-soft"/> + <arg value="-DCMAKE_TOOLCHAIN_FILE=../../openal-soft/cmake/toolchain.gcc-default.cmake"/> </exec> <exec dir="${build}/openal-soft" executable="make" logError="true" failonerror="false" failifexecutionfails="false" /> </target> @@ -508,7 +524,7 @@ </target> <target name="c.build.openal.soft" - depends="init, gluegen.cpptasks.detect.os, gluegen.cpptasks.setup.compiler, c.build.openal.use-blobs, c.build.openal.soft.windows, c.build.openal.soft.android, c.build.openal.soft.default"> + depends="init, gluegen.cpptasks.detect.os, gluegen.cpptasks.setup.compiler, c.build.openal.use-blobs, c.build.openal.soft.windows, c.build.openal.soft.android, c.build.openal.soft.gcc.x86_32, c.build.openal.soft.gcc.default"> <copy todir="../${rootrel.build}/obj" failonerror="false"> <fileset dir="${build}/openal-soft" erroronmissingdir="false"> <include name="*openal.${native.library.suffix}" /> diff --git a/make/scripts/make.joal.all.linux-i586.sh b/make/scripts/make.joal.all.linux-x86.sh index ba4e621..579b7f0 100755 --- a/make/scripts/make.joal.all.linux-i586.sh +++ b/make/scripts/make.joal.all.linux-x86.sh @@ -2,8 +2,8 @@ SDIR=`dirname $0` -if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-i586.sh ] ; then - . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-i586.sh +if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86.sh ] ; then + . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86.sh fi if [ -z "$ANT_PATH" ] ; then @@ -18,14 +18,10 @@ if [ -z "$ANT_PATH" ] ; then exit fi -# -Drootrel.build=build-586 \ # -Dtarget.sourcelevel=1.6 \ # -Dtarget.targetlevel=1.6 \ # -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \ ant \ - -Dtarget.sourcelevel=1.6 \ - -Dtarget.targetlevel=1.6 \ - -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \ - -Drootrel.build=build-i586 \ - $* 2>&1 | tee make.joal.all.linux-i586.log + -Drootrel.build=build-x86 \ + $* 2>&1 | tee make.joal.all.linux-x86.log diff --git a/openal-soft b/openal-soft -Subproject 4e35b8521dea1e1fdf940b7bc719cf3a349bbf2 +Subproject cc19a6716ff24522b8c705c3ab27f6df2098223 |