Update the cross-tools locations.

This commit is contained in:
Bill Currie 2012-02-08 21:06:39 +09:00
parent 120f26cdac
commit cc443c42e6
2 changed files with 6 additions and 4 deletions

View file

@ -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 ## configure.ac needs to be listed here for older autoconfs
EXTRA_DIST= ChangeLog configure.ac bootstrap \ EXTRA_DIST= ChangeLog configure.ac bootstrap \
tools/cross/cross-configure.sh tools/cross/cross-make.sh \ tools/cross/droid/arm-linux-androideabi-pkg-config \
tools/cross/cross.sh \ 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/Makefile tools/gas2masm/gas2masm.c \
tools/gas2masm/gas2masm.dsp tools/gas2masm/gas2masm.dsw \ tools/gas2masm/gas2masm.dsp tools/gas2masm/gas2masm.dsw \
tools/gas2masm/gas2masm.mak tools/gas2masm/gas2masm.mdp tools/gas2masm/gas2masm.mak tools/gas2masm/gas2masm.mdp

View file

@ -108,13 +108,13 @@ if test $do_win32 -eq 1; then
qf_win32_dir=`pwd`"/$qf_win32" qf_win32_dir=`pwd`"/$qf_win32"
mingw32="/usr/local/cross-tools/i386-mingw32msvc" mingw32="/usr/local/cross-tools/i386-mingw32msvc"
sed -e 's@^\./config@../config@' \ 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 chmod +x cross-configure.sh
rm -rf $qf_win32_dir *.zip rm -rf $qf_win32_dir *.zip
./cross-configure.sh \ ./cross-configure.sh \
--disable-debug --disable-shared \ --disable-debug --disable-shared \
--program-prefix= --program-prefix=
../tools/cross/cross-make.sh $QFSMP \ ../tools/cross/mingw/cross-make.sh $QFSMP \
prefix=${qf_win32_dir} \ prefix=${qf_win32_dir} \
exec_prefix=${qf_win32_dir} \ exec_prefix=${qf_win32_dir} \
pkgdatadir=${qf_win32_dir}/QF \ pkgdatadir=${qf_win32_dir}/QF \