teambeef/ioq3quest
0
0
Fork 0
mirror of https://github.com/DrBeef/ioq3quest.git synced 2024-11-10 14:52:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Solaris fixes by Vincent Cojot

Browse source
This commit is contained in:
Ludwig Nussel 2007-11-30 15:08:57 +00:00
parent fdff748749
commit ccc66aadff
5 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Makefile
View file

@ -702,6 +702,7 @@ ifeq ($(PLATFORM),sunos)
BASE_CFLAGS += -m32 BASE_CFLAGS += -m32
LDFLAGS += -m32 LDFLAGS += -m32
BASE_CFLAGS += -I/usr/X11/include/NVIDIA BASE_CFLAGS += -I/usr/X11/include/NVIDIA
CLIENT_LDFLAGS += -L/usr/X11/lib/NVIDIA -R/usr/X11/lib/NVIDIA
endif endif
endif endif
@ -722,7 +723,7 @@ ifeq ($(PLATFORM),sunos)
BOTCFLAGS=-O0 BOTCFLAGS=-O0
CLIENT_LDFLAGS=$(shell sdl-config --libs) -lGL CLIENT_LDFLAGS +=$(shell sdl-config --libs) -lGL
else # ifeq sunos else # ifeq sunos

12
misc/setup/Solaris_pkg.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# Source directory # Source directory
MOUNT_DIR="../../.." MOUNT_DIR="../.."
# Solaris stuff # Solaris stuff
PLATFORM=`uname|sed -e s/_.*//|tr '[:upper:]' '[:lower:]'` PLATFORM=`uname|sed -e s/_.*//|tr '[:upper:]' '[:lower:]'`
@ -29,9 +29,9 @@ DATA_PKGFILE="${PKG_DATA_NAME}-${BUILD_VERSION}-${PKG_VERSION}-${ARCH}.pkg"
# build directories # build directories
BUILD_DIR="${MOUNT_DIR}/build/release-${PLATFORM}-${ARCH}" BUILD_DIR="${MOUNT_DIR}/build/release-${PLATFORM}-${ARCH}"
PKG_SRC_DIR="${MOUNT_DIR}/code/unix/setup/pkg/${PKG_SOLARIS_NAME}" PKG_SRC_DIR="${MOUNT_DIR}/misc/setup/pkg/${PKG_SOLARIS_NAME}"
PKG_BUILD_DIR="/tmp/ioquake3-build/${PKG_SOLARIS_NAME}-${BUILD_VERSION}" PKG_BUILD_DIR="/tmp/ioquake3-build/${PKG_SOLARIS_NAME}-${BUILD_VERSION}"
PKG_DATA_SRC_DIR="${MOUNT_DIR}/code/unix/setup/pkg/${PKG_DATA_NAME}" PKG_DATA_SRC_DIR="${MOUNT_DIR}/misc/setup/pkg/${PKG_DATA_NAME}"
PKG_DATA_BUILD_DIR="/usr/local/src/quake3-data/quake3" PKG_DATA_BUILD_DIR="/usr/local/src/quake3-data/quake3"
# Tools # Tools
@ -80,8 +80,8 @@ if [ -d ${BUILD_DIR} ]; then
for EXEC_SH in ioq3ded.sh ioquake3.sh for EXEC_SH in ioq3ded.sh ioquake3.sh
do do
if [ -f ${MOUNT_DIR}/code/unix/setup/pkg/${EXEC_SH} ]; then if [ -f ${MOUNT_DIR}/misc/setup/pkg/${EXEC_SH} ]; then
${INSTALL_BIN} ${MOUNT_DIR}/code/unix/setup/pkg/${EXEC_SH} ${PKG_BUILD_DIR}/${EXEC_SH} ${INSTALL_BIN} ${MOUNT_DIR}/misc/setup/pkg/${EXEC_SH} ${PKG_BUILD_DIR}/${EXEC_SH}
fi fi
done done
@ -118,7 +118,7 @@ if [ -d ${BUILD_DIR} ]; then
fi fi
fi fi
if [ -f ${EULA_DIR}/id_patch_pk3s_Q3A_EULA.txt ]; then if [ -f ${EULA_DIR}/id_patch_pk3s_Q3A_EULA.txt ]; then
${INSTALL_DATA} ${EULA_DIR}/id_patch_pk3s_Q3A_EULA.txt ${PKG_DATA_SRC_DIR}/copyright ${INSTALL_DATA} ${EULA_DIR}/id_patch_pk3s_Q3A_EULA.txt ${PKG_DATA_SRC_DIR}/copyright
fi fi
${PKGPROTO} ${PKG_DATA_BUILD_DIR}=quake3 | \ ${PKGPROTO} ${PKG_DATA_BUILD_DIR}=quake3 | \

11
misc/setup/pkg/ioq3ded.sh
View file

@ -2,22 +2,21 @@
# Rev: $Id: ioq3ded.sh,v 1.9 2006/01/18 13:47:42 raistlin Exp raistlin $ # Rev: $Id: ioq3ded.sh,v 1.9 2006/01/18 13:47:42 raistlin Exp raistlin $
# Needed to make symlinks/shortcuts work. # Needed to make symlinks/shortcuts work.
# the binaries must run with correct working directory # the binaries must run with correct working directory
#
IOQ3_DIR=/usr/local/share/games/quake3 IOQ3_DIR=/usr/local/share/games/quake3
COMPILE_PLATFORM=`uname|sed -e s/_.*//|tr A-Z a-z` 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/i386/`
EXEC_REL=release EXEC_REL=release
#EXEC_BIN=ioquake3.${COMPILE_ARCH} # EXEC_BIN=ioquake3.${COMPILE_ARCH}
#EXEC_BIN=ioquake3-smp.${COMPILE_ARCH} # EXEC_BIN=ioquake3-smp.${COMPILE_ARCH}
EXEC_BIN=ioq3ded.${COMPILE_ARCH} EXEC_BIN=ioq3ded.${COMPILE_ARCH}
EXEC_FLAGS="+set fs_cdpath ${IOQ3_DIR} +set vm_game 1 +set vm_cgame 1 +set vm_ui 1 +set sv_pure 1 +set ttycon 0" EXEC_FLAGS="+set fs_basepath ${IOQ3_DIR} +set vm_game 1 +set vm_cgame 1 +set vm_ui 1 +set sv_pure 1 +set com_ansiColor 0"
EXEC_DIR_LIST=${IOQ3_DIR} EXEC_DIR_LIST="${IOQ3_DIR}"
for d in ${EXEC_DIR_LIST} for d in ${EXEC_DIR_LIST}
do do

10
misc/setup/pkg/ioquake3.sh
View file

@ -5,18 +5,18 @@
IOQ3_DIR=/usr/local/share/games/quake3 IOQ3_DIR=/usr/local/share/games/quake3
COMPILE_PLATFORM=`uname|sed -e s/_.*//|tr A-Z a-z` 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/i386/`
EXEC_REL=release EXEC_REL=release
EXEC_BIN=ioquake3.${COMPILE_ARCH} EXEC_BIN=ioquake3.${COMPILE_ARCH}
#EXEC_BIN=ioquake3-smp.${COMPILE_ARCH} # EXEC_BIN=ioquake3-smp.${COMPILE_ARCH}
#EXEC_BIN=ioq3ded.${COMPILE_ARCH} # EXEC_BIN=ioq3ded.${COMPILE_ARCH}
EXEC_FLAGS="+set fs_cdpath ${IOQ3_DIR} +set vm_game 1 +set vm_cgame 1 +set vm_ui 1 +set sv_pure 1 +set ttycon 0" EXEC_FLAGS="+set fs_basepath ${IOQ3_DIR} +set vm_game 1 +set vm_cgame 1 +set vm_ui 1 +set sv_pure 1 +set com_ansiColor 0"
EXEC_DIR_LIST=${IOQ3_DIR} EXEC_DIR_LIST="${IOQ3_DIR}"
for d in ${EXEC_DIR_LIST} for d in ${EXEC_DIR_LIST}
do do

1
misc/setup/pkg/ioquake3d/prototype.template
View file

@ -1,6 +1,5 @@
!default 0755 root bin !default 0755 root bin
i pkginfo i pkginfo
i copyright
i depend i depend
i postinstall i postinstall
i postremove i postremove