mirror of
https://github.com/UberGames/lilium-voyager.git
synced 2024-12-13 13:40:56 +00:00
Update arch in misc/setup for ioq3 changing from i386 to x86
This commit is contained in:
parent
2955f8dadb
commit
00a5339b27
8 changed files with 14 additions and 14 deletions
|
@ -11,7 +11,7 @@ fi
|
||||||
|
|
||||||
|
|
||||||
if [ "X`uname -m`" = "Xi86pc" ]; then
|
if [ "X`uname -m`" = "Xi86pc" ]; then
|
||||||
ARCH=i386
|
ARCH=x86
|
||||||
else
|
else
|
||||||
ARCH=sparc
|
ARCH=sparc
|
||||||
fi
|
fi
|
||||||
|
@ -94,7 +94,7 @@ if [ -d ${BUILD_DIR} ]; then
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
for EXEC_SO in cgamesparc.so qagamesparc.so uisparc.so cgamei386.so qagamei386.so uii386.so
|
for EXEC_SO in cgamesparc.so qagamesparc.so uisparc.so cgamex86.so qagamex86.so uix86.so
|
||||||
do
|
do
|
||||||
if [ -f ${BUILD_DIR}/baseq3/${EXEC_SO} ]; then
|
if [ -f ${BUILD_DIR}/baseq3/${EXEC_SO} ]; then
|
||||||
${INSTALL_BIN} ${BUILD_DIR}/baseq3/${EXEC_SO} ${PKG_BUILD_DIR}/baseq3/${EXEC_SO}
|
${INSTALL_BIN} ${BUILD_DIR}/baseq3/${EXEC_SO} ${PKG_BUILD_DIR}/baseq3/${EXEC_SO}
|
||||||
|
|
|
@ -46,8 +46,8 @@ archs=()
|
||||||
for arch in $topdir/build/release-*; do
|
for arch in $topdir/build/release-*; do
|
||||||
arch=${arch##*-}
|
arch=${arch##*-}
|
||||||
case "$arch" in
|
case "$arch" in
|
||||||
i386) echo "define(HAVE_I386,yes)dnl" >> defines.m4
|
x86) echo "define(HAVE_X86,yes)dnl" >> defines.m4
|
||||||
copystartscript x86
|
copystartscript $arch
|
||||||
;;
|
;;
|
||||||
x86_64) echo "define(HAVE_X86_64,yes)dnl" >> defines.m4
|
x86_64) echo "define(HAVE_X86_64,yes)dnl" >> defines.m4
|
||||||
copystartscript $arch
|
copystartscript $arch
|
||||||
|
|
|
@ -38,8 +38,8 @@ export LD_LIBRARY_PATH
|
||||||
|
|
||||||
archs=`uname -m`
|
archs=`uname -m`
|
||||||
case "$archs" in
|
case "$archs" in
|
||||||
i?86) archs=i386 ;;
|
i?86) archs=x86 ;;
|
||||||
x86_64) archs="x86_64 i386" ;;
|
x86_64) archs="x86_64 x86" ;;
|
||||||
ppc64) archs="ppc64 ppc" ;;
|
ppc64) archs="ppc64 ppc" ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
|
|
@ -24,9 +24,9 @@ PKG_VERSION=$VERSION
|
||||||
ARCH=${ARCH:-i586}
|
ARCH=${ARCH:-i586}
|
||||||
|
|
||||||
if [ "$ARCH" = "i?86" ]; then
|
if [ "$ARCH" = "i?86" ]; then
|
||||||
ARCHSUFFIX="i386"
|
ARCHSUFFIX="x86"
|
||||||
elif [ "$ARCH" = "x86_64" ]; then
|
elif [ "$ARCH" = "x86_64" ]; then
|
||||||
ARCHSUFFIX="64"
|
ARCHSUFFIX="x86_64"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
BUILD=${BUILD:-1_io}
|
BUILD=${BUILD:-1_io}
|
||||||
|
|
|
@ -38,8 +38,8 @@ export LD_LIBRARY_PATH
|
||||||
|
|
||||||
archs=`uname -m`
|
archs=`uname -m`
|
||||||
case "$archs" in
|
case "$archs" in
|
||||||
i?86) archs=i386 ;;
|
i?86) archs=x86 ;;
|
||||||
x86_64) archs="x86_64 i386" ;;
|
x86_64) archs="x86_64 x86" ;;
|
||||||
ppc64) archs="ppc64 ppc" ;;
|
ppc64) archs="ppc64 ppc" ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@ fi
|
||||||
export LD_LIBRARY_PATH
|
export LD_LIBRARY_PATH
|
||||||
|
|
||||||
COMPILE_PLATFORM=`uname|sed -e 's/_.*//'|tr '[:upper:]' '[:lower:]'`
|
COMPILE_PLATFORM=`uname|sed -e 's/_.*//'|tr '[:upper:]' '[:lower:]'`
|
||||||
COMPILE_ARCH=`uname -p | sed -e 's/i.86/i386/'`
|
COMPILE_ARCH=`uname -p | sed -e 's/i.86/x86/'`
|
||||||
|
|
||||||
EXEC_REL=release
|
EXEC_REL=release
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@ fi
|
||||||
export LD_LIBRARY_PATH
|
export LD_LIBRARY_PATH
|
||||||
|
|
||||||
COMPILE_PLATFORM=`uname|sed -e 's/_.*//'|tr '[:upper:]' '[:lower:]'`
|
COMPILE_PLATFORM=`uname|sed -e 's/_.*//'|tr '[:upper:]' '[:lower:]'`
|
||||||
COMPILE_ARCH=`uname -p | sed -e 's/i.86/i386/'`
|
COMPILE_ARCH=`uname -p | sed -e 's/i.86/x86/'`
|
||||||
|
|
||||||
EXEC_REL=release
|
EXEC_REL=release
|
||||||
|
|
||||||
|
|
|
@ -24,12 +24,12 @@ ifelse(HAVE_X86_64,yes,dnl
|
||||||
<help>you need the binaries to play the game</help>
|
<help>you need the binaries to play the game</help>
|
||||||
</option>
|
</option>
|
||||||
)dnl
|
)dnl
|
||||||
ifelse(HAVE_I386,yes,dnl
|
ifelse(HAVE_X86,yes,dnl
|
||||||
<option install="true" if="|(x86,x86_64)">
|
<option install="true" if="|(x86,x86_64)">
|
||||||
ioq3 x86 (32 bit) binaries
|
ioq3 x86 (32 bit) binaries
|
||||||
<binary libc="any" symlink="ioquake3" icon="quake3.png" name="ioquake3">ioquake3</binary>
|
<binary libc="any" symlink="ioquake3" icon="quake3.png" name="ioquake3">ioquake3</binary>
|
||||||
<files>
|
<files>
|
||||||
ioquake3.i386.tar
|
ioquake3.x86.tar
|
||||||
</files>
|
</files>
|
||||||
<help>you need the binaries to play the game</help>
|
<help>you need the binaries to play the game</help>
|
||||||
</option>
|
</option>
|
||||||
|
|
Loading…
Reference in a new issue