qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-22 20:41:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make all the cross-compiling scripts consistent.

Browse source 
Now all cross builds automatically build qfcc and pak, bail on error, and
use pkg-config correctly.
This commit is contained in:
Bill Currie 2012-11-29 11:19:09 +09:00
parent 042cae29b1
commit 6857fe55ce
7 changed files with 56 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tools/cross/droid/cross-make.sh
View file

@ -9,7 +9,8 @@ if test -d native; then
fi fi
export ANDROID_NDK_ROOT=/opt/android-ndk-r7 export ANDROID_NDK_ROOT=/opt/android-ndk-r7
export ANDROID_SYSROOT=$ANDROID_NDK_ROOT/android-14-toolchain/sysroot export ANDROID_SYSROOT=$ANDROID_NDK_ROOT/android-14-toolchain/sysroot
export PKG_CONFIG_LIBDIR=$ANDROID_SYSROOT/lib/pkgconfig
export PKG_CONFIG_PATH=$ANDROID_SYSROOT/usr/local/lib/pkgconfig
export PATH=$ANDROID_NDK_ROOT/android-14-toolchain/bin:$PATH export PATH=$ANDROID_NDK_ROOT/android-14-toolchain/bin:$PATH
make PAK='$(top_builddir)/pak' QFCC='$(top_builddir)/qfcc' $* make PAK='$(top_builddir)/pak' QFCC='$(top_builddir)/qfcc' $*

20
tools/cross/mingw/cross-configure.sh
View file

@ -1,7 +1,19 @@
#!/bin/sh -x #!/bin/sh -x
MINGW=/home/bill/src/mingw/mingw-cross-env-2.18 set -e
export PKG_CONFIG_LIBDIR=$MINGW/usr/lib/pkgconfig mkdir -p native i686-pc-mingw32
cd native
../../configure \
--disable-shared \
--without-clients \
--without-servers \
--with-tools=qfcc,pak
cd ../i686-pc-mingw32
export MINGW=/home/bill/src/mingw/mingw-cross-env-2.18
export MINGW_USR=$MINGW/usr/i686-pc-mingw32
export PKG_CONFIG_LIBDIR=$MINGW_USR/lib/pkgconfig
export PKG_CONFIG_PATH=$MINGW_USR/local/lib/pkgconfig
export PATH=$MINGW/usr/bin:$PATH export PATH=$MINGW/usr/bin:$PATH
../configure --host=i686-pc-mingw32 \ ../../configure \
SDL_CONFIG=$MINGW/usr/i686-pc-mingw32/bin/sdl-config \ --host=i686-pc-mingw32 \
--disable-shared \
$* $*

16
tools/cross/mingw/cross-make.sh
View file

@ -1,6 +1,16 @@
#!/bin/sh -x #!/bin/sh -x
MINGW=/home/bill/src/mingw/mingw-cross-env-2.18 set -e
export PKG_CONFIG_LIBDIR=$MINGW/usr/lib/pkgconfig if test -d native; then
cd native
make $*
cd ../i686-pc-mingw32
ln -fs ../native/tools/qfcc/source/qfcc .
ln -fs ../native/tools/pak/pak .
fi
export MINGW=/home/bill/src/mingw/mingw-cross-env-2.18
export MINGW_USR=$MINGW/usr/i686-pc-mingw32
export PKG_CONFIG_LIBDIR=$MINGW_USR/lib/pkgconfig
export PKG_CONFIG_PATH=$MINGW_USR/local/lib/pkgconfig
export PATH=$MINGW/usr/bin:$PATH export PATH=$MINGW/usr/bin:$PATH
make PAK=pak QFCC=qfcc $* make PAK='$(top_builddir)/pak' QFCC='$(top_builddir)/qfcc' $*

16
tools/cross/mipsel-linux/cross-configure.sh
View file

@ -1,13 +1,21 @@
#!/bin/sh -x #!/bin/sh -x
mkdir native mipsel-linux set -e
mkdir -p native mipsel-linux
cd native cd native
../../configure --without-clients --without-servers --with-tools=qfcc,pak ../../configure \
--disable-shared \
--without-clients \
--without-servers \
--with-tools=qfcc,pak
cd ../mipsel-linux cd ../mipsel-linux
export MIPSEL=/opt/gcw0-toolchain export MIPSEL=/opt/gcw0-toolchain
export PKG_CONFIG_LIBDIR=$MIPSEL/usr/mipsel-gcw0-linux-uclibc/sysroot/lib/pkgconfig export MIPSEL_SYSROOT=$MIPSEL/usr/mipsel-gcw0-linux-uclibc/sysroot
export PKG_CONFIG_LIBDIR=$MIPSEL_SYSROOT/lib/pkgconfig
export PKG_CONFIG_PATH=$MIPSEL_SYSROOT/usr/local/lib/pkgconfig
export PATH=$MIPSEL/usr/bin:$PATH export PATH=$MIPSEL/usr/bin:$PATH
../../configure --host=mipsel-linux \ ../../configure --host=mipsel-linux \
--with-sysroot=$MIPSEL_SYSROOT \
--disable-sdl-cd \ --disable-sdl-cd \
--with-endian=little \ --with-endian=little \
SDL_CONFIG=$MIPSEL/usr/mipsel-gcw0-linux-uclibc/sysroot/usr/bin/sdl-config \ SDL_CONFIG=$MIPSEL_SYSROOT/usr/bin/sdl-config \
$* $*

5
tools/cross/mipsel-linux/cross-make.sh
View file

@ -1,4 +1,5 @@
#!/bin/sh -x #!/bin/sh -x
set -e
if test -d native; then if test -d native; then
cd native cd native
make make
@ -7,7 +8,9 @@ if test -d native; then
ln -fs ../native/tools/pak/pak . ln -fs ../native/tools/pak/pak .
fi fi
export MIPSEL=/opt/gcw0-toolchain export MIPSEL=/opt/gcw0-toolchain
export PKG_CONFIG_LIBDIR=$MIPSEL/usr/mipsel-gcw0-linux-uclibc/sysroot/lib/pkgconfig export MIPSEL_SYSROOT=$MIPSEL/usr/mipsel-gcw0-linux-uclibc/sysroot
export PKG_CONFIG_LIBDIR=$MIPSEL_SYSROOT/lib/pkgconfig
export PKG_CONFIG_PATH=$MIPSEL_SYSROOT/usr/local/lib/pkgconfig
export PATH=$MIPSEL/usr/bin:$PATH export PATH=$MIPSEL/usr/bin:$PATH
make PAK='$(top_builddir)/pak' QFCC='$(top_builddir)/qfcc' $* make PAK='$(top_builddir)/pak' QFCC='$(top_builddir)/qfcc' $*

9
tools/cross/ps3-elf/cross-configure.sh
View file

@ -1,7 +1,12 @@
#!/bin/sh -x #!/bin/sh -x
mkdir native powerpc64-ps3-elf set -e
mkdir -p native powerpc64-ps3-elf
cd native cd native
../../configure --without-clients --without-servers --with-tools=qfcc,pak ../../configure \
--disable-shared \
--without-clients \
--without-servers \
--with-tools=qfcc,pak
cd ../powerpc64-ps3-elf cd ../powerpc64-ps3-elf
export PS3DEV=/usr/local/ps3dev export PS3DEV=/usr/local/ps3dev
export PSL1GHT=$PS3DEV export PSL1GHT=$PS3DEV

3
tools/cross/ps3-elf/cross-make.sh
View file

@ -1,7 +1,8 @@
#!/bin/sh -x #!/bin/sh -x
set -e
if test -d native; then if test -d native; then
cd native cd native
make make $*
cd ../powerpc64-ps3-elf cd ../powerpc64-ps3-elf
ln -fs ../native/tools/qfcc/source/qfcc . ln -fs ../native/tools/qfcc/source/qfcc .
ln -fs ../native/tools/pak/pak . ln -fs ../native/tools/pak/pak .