From 2229c7557d512f964b5ce64feae0c9b432b951d1 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Thu, 23 Dec 2010 11:45:08 +0900 Subject: [PATCH] Update cross-build scripts. They're hard-coded for my current setup, but easy to fix. --- tools/cross/cross-configure.sh | 12 +++++------- tools/cross/cross-make.sh | 7 ++++--- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/tools/cross/cross-configure.sh b/tools/cross/cross-configure.sh index d59f2b58e..d75786e8a 100755 --- a/tools/cross/cross-configure.sh +++ b/tools/cross/cross-configure.sh @@ -1,9 +1,7 @@ #!/bin/sh - -PKG_CONFIG_PATH=/usr/local/cross-tools/i386-mingw32msvc/lib/pkgconfig PATH=/usr/i586-mingw32msvc/bin:$PATH \ - ./configure \ - --host=i586-mingw32msvc \ - --target=i586-mingw32msvc \ - --build=i586-linux \ - $* +MINGW=/home/bill/src/mingw/mingw-cross-env-2.18 +export PKG_CONFIG_PATH=$MINGW/usr/lib/pkgconfig +export PATH=$MINGW/usr/bin:$PATH +../configure --host=i686-pc-mingw32 \ + SDL_CONFIG=$MINGW/usr/i686-pc-mingw32/bin/sdl-config $* diff --git a/tools/cross/cross-make.sh b/tools/cross/cross-make.sh index 9920da69d..4f8c154cd 100755 --- a/tools/cross/cross-make.sh +++ b/tools/cross/cross-make.sh @@ -1,7 +1,8 @@ #!/bin/sh -x HOST_CC=gcc -PATH=/usr/i586-mingw32msvc/bin:$PATH export HOST_CC -export PATH -make $* +MINGW=/home/bill/src/mingw/mingw-cross-env-2.18 +export PATH=$MINGW/usr/bin:$PATH + +make PAK=pak QFCC=qfcc $*