diff options
| -rwxr-xr-x | make/build.xml | 37 | ||||
| -rwxr-xr-x | make/scripts/make.joal.all.linux-armv6-cross.sh | 2 | ||||
| -rwxr-xr-x | make/scripts/make.joal.all.linux-armv6hf-cross.sh | 2 | ||||
| m--------- | openal-soft | 0 |
4 files changed, 38 insertions, 3 deletions
diff --git a/make/build.xml b/make/build.xml index f326ea0..d22113d 100755 --- a/make/build.xml +++ b/make/build.xml @@ -187,6 +187,21 @@ <property name="archive.name" value="joal-${joal.version}-${os.and.arch}" /> <property name="archive" value="${build}/${archive.name}" /> + + <condition property="useLinuxARMv6SFOptions"> + <and> + <istrue value="isLinuxARMv6"/> + <istrue value="isAbiEabiGnuArmel"/> + <istrue value="isCrosscompilation"/> + </and> + </condition> + <condition property="useLinuxARMv6HFOptions"> + <and> + <istrue value="isLinuxARMv6"/> + <istrue value="isAbiEabiGnuArmhf"/> + <istrue value="isCrosscompilation"/> + </and> + </condition> </target> <!-- ================================================================== --> @@ -503,6 +518,26 @@ <exec dir="${build}/openal-soft" executable="make" logError="true" failonerror="false" failifexecutionfails="false" /> </target> + <target name="c.build.openal.soft.gcc.armv6.soft" if="useLinuxARMv6SFOptions" 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-armv6.cmake"/> + </exec> + <exec dir="${build}/openal-soft" executable="make" logError="true" failonerror="false" failifexecutionfails="false" /> + </target> + + <target name="c.build.openal.soft.gcc.armv6.hard" if="useLinuxARMv6HFOptions" 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-armv6hf.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" /> @@ -524,7 +559,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.gcc.x86_32, c.build.openal.soft.gcc.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.armv6.soft, c.build.openal.soft.gcc.armv6.hard, 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-armv6-cross.sh b/make/scripts/make.joal.all.linux-armv6-cross.sh index c499f12..2b1a057 100755 --- a/make/scripts/make.joal.all.linux-armv6-cross.sh +++ b/make/scripts/make.joal.all.linux-armv6-cross.sh @@ -6,7 +6,7 @@ if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh fi -PATH=`pwd`/../../gluegen/make/lib/linux/arm-linux-gnueabi/bin:$PATH +PATH=`pwd`/../../gluegen/make/lib/toolchain/armsf-linux-gnueabi/bin:$PATH export PATH # -Dc.compiler.debug=true diff --git a/make/scripts/make.joal.all.linux-armv6hf-cross.sh b/make/scripts/make.joal.all.linux-armv6hf-cross.sh index 78f1110..0a6770a 100755 --- a/make/scripts/make.joal.all.linux-armv6hf-cross.sh +++ b/make/scripts/make.joal.all.linux-armv6hf-cross.sh @@ -6,7 +6,7 @@ if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh fi -PATH=`pwd`/../../gluegen/make/lib/linux/arm-linux-gnueabihf/bin:$PATH +PATH=`pwd`/../../gluegen/make/lib/toolchain/armhf-linux-gnueabi/bin:$PATH export PATH # -Dc.compiler.debug=true diff --git a/openal-soft b/openal-soft -Subproject 43e1ba37166d7ebdea355c50a60dee9140bcf77 +Subproject 4bc21c454fc0583e249db3f23a3cf7aca72dd61 |