From cc443c42e6faf353042228384596e8197d455b68 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Wed, 8 Feb 2012 21:06:39 +0900 Subject: [PATCH] Update the cross-tools locations. --- Makefile.am | 6 ++++-- tools/build_scripts/qf-release | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index b55edd7e4..882f8ca28 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,8 +8,10 @@ SUBDIRS=RPM debian desktop doc include libs hw nq qtv qw tools ruamoko \ ## configure.ac needs to be listed here for older autoconfs EXTRA_DIST= ChangeLog configure.ac bootstrap \ - tools/cross/cross-configure.sh tools/cross/cross-make.sh \ - tools/cross/cross.sh \ + tools/cross/droid/arm-linux-androideabi-pkg-config \ + tools/cross/droid/cross-configure.sh tools/cross/droid/cross-make.sh \ + tools/cross/mingw/cross-configure.sh tools/cross/mingw/cross-make.sh \ + tools/cross/mingw/cross.sh \ tools/gas2masm/Makefile tools/gas2masm/gas2masm.c \ tools/gas2masm/gas2masm.dsp tools/gas2masm/gas2masm.dsw \ tools/gas2masm/gas2masm.mak tools/gas2masm/gas2masm.mdp diff --git a/tools/build_scripts/qf-release b/tools/build_scripts/qf-release index df517874f..e21ae2d76 100755 --- a/tools/build_scripts/qf-release +++ b/tools/build_scripts/qf-release @@ -108,13 +108,13 @@ if test $do_win32 -eq 1; then qf_win32_dir=`pwd`"/$qf_win32" mingw32="/usr/local/cross-tools/i386-mingw32msvc" sed -e 's@^\./config@../config@' \ - ../tools/cross/cross-configure.sh > cross-configure.sh + ../tools/cross/mingw/cross-configure.sh > cross-configure.sh chmod +x cross-configure.sh rm -rf $qf_win32_dir *.zip ./cross-configure.sh \ --disable-debug --disable-shared \ --program-prefix= - ../tools/cross/cross-make.sh $QFSMP \ + ../tools/cross/mingw/cross-make.sh $QFSMP \ prefix=${qf_win32_dir} \ exec_prefix=${qf_win32_dir} \ pkgdatadir=${qf_win32_dir}/QF \