mirror of
https://github.com/DrBeef/ioq3quest.git
synced 2024-11-10 23:02:01 +00:00
Merge mingw build scripts
This commit is contained in:
parent
2c8e751130
commit
e2f520e001
2 changed files with 11 additions and 37 deletions
|
@ -2,7 +2,17 @@
|
||||||
|
|
||||||
# Note: This works in Linux and cygwin
|
# Note: This works in Linux and cygwin
|
||||||
|
|
||||||
CMD_PREFIX="i586-mingw32msvc i686-w64-mingw32";
|
if [ "$ARCH" = "x86_64" ];
|
||||||
|
then
|
||||||
|
CMD_PREFIX="amd64-mingw32msvc x86_64-w64-mingw32"
|
||||||
|
else
|
||||||
|
CMD_PREFIX="i586-mingw32msvc i686-w64-mingw32"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$CC" = "cc" ] || [ "$CC" = "gcc" ];
|
||||||
|
then
|
||||||
|
CC=
|
||||||
|
fi
|
||||||
|
|
||||||
if [ "X$CC" = "X" ]; then
|
if [ "X$CC" = "X" ]; then
|
||||||
for check in $CMD_PREFIX; do
|
for check in $CMD_PREFIX; do
|
||||||
|
@ -30,6 +40,5 @@ if [ "X$WINDRES" = "X" -o "X$CC" = "X" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
export PLATFORM=mingw32
|
export PLATFORM=mingw32
|
||||||
export ARCH=x86
|
|
||||||
|
|
||||||
exec make $*
|
exec make $*
|
||||||
|
|
|
@ -1,35 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
# Note: This works in Linux and cygwin
|
|
||||||
|
|
||||||
CMD_PREFIX="amd64-mingw32msvc x86_64-w64-mingw32";
|
|
||||||
|
|
||||||
if [ "X$CC" = "X" ]; then
|
|
||||||
for check in $CMD_PREFIX; do
|
|
||||||
full_check="${check}-gcc"
|
|
||||||
which "$full_check" > /dev/null 2>&1
|
|
||||||
if [ "$?" = "0" ]; then
|
|
||||||
export CC="$full_check"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "X$WINDRES" = "X" ]; then
|
|
||||||
for check in $CMD_PREFIX; do
|
|
||||||
full_check="${check}-windres"
|
|
||||||
which "$full_check" > /dev/null 2>&1
|
|
||||||
if [ "$?" = "0" ]; then
|
|
||||||
export WINDRES="$full_check"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "X$WINDRES" = "X" -o "X$CC" = "X" ]; then
|
|
||||||
echo "Error: Must define or find WINDRES and CC"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
export PLATFORM=mingw32
|
|
||||||
export ARCH=x86_64
|
|
||||||
|
|
||||||
exec make $*
|
|
Loading…
Reference in a new issue