Solaris fixes by Vincent Cojot

git-svn-id: svn://svn.icculus.org/quake3/trunk@1221 edf5b092-35ff-0310-97b2-ce42778d08ea

5 files changed, 18 insertions, 19 deletions

diff --git a/Makefile b/Makefile
index e702235..447b19e 100644
--- a/Makefile
+++ b/Makefile
@@ -702,6 +702,7 @@ ifeq ($(PLATFORM),sunos)
     BASE_CFLAGS += -m32
     LDFLAGS += -m32
     BASE_CFLAGS += -I/usr/X11/include/NVIDIA
+    CLIENT_LDFLAGS += -L/usr/X11/lib/NVIDIA -R/usr/X11/lib/NVIDIA
   endif
   endif
 
@@ -722,7 +723,7 @@ ifeq ($(PLATFORM),sunos)
 
   BOTCFLAGS=-O0
 
-  CLIENT_LDFLAGS=$(shell sdl-config --libs) -lGL
+  CLIENT_LDFLAGS +=$(shell sdl-config --libs) -lGL
 
 else # ifeq sunos
 
diff --git a/misc/setup/Solaris_pkg.sh b/misc/setup/Solaris_pkg.sh
index de00459..6b64201 100644
--- a/misc/setup/Solaris_pkg.sh
+++ b/misc/setup/Solaris_pkg.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Source directory
-MOUNT_DIR="../../.."
+MOUNT_DIR="../.."
 
 # Solaris stuff
 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_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_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"
 
 # Tools
@@ -80,8 +80,8 @@ if [ -d ${BUILD_DIR} ]; then
 
 	for EXEC_SH in ioq3ded.sh ioquake3.sh
 	do
-		if [ -f ${MOUNT_DIR}/code/unix/setup/pkg/${EXEC_SH} ]; then
-        		${INSTALL_BIN} ${MOUNT_DIR}/code/unix/setup/pkg/${EXEC_SH} ${PKG_BUILD_DIR}/${EXEC_SH}
+		if [ -f ${MOUNT_DIR}/misc/setup/pkg/${EXEC_SH} ]; then
+        		${INSTALL_BIN} ${MOUNT_DIR}/misc/setup/pkg/${EXEC_SH} ${PKG_BUILD_DIR}/${EXEC_SH}
 		fi
 	done
 
@@ -118,7 +118,7 @@ if [ -d ${BUILD_DIR} ]; then
 		fi
 	fi
 	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
 
         ${PKGPROTO} ${PKG_DATA_BUILD_DIR}=quake3 | \
diff --git a/misc/setup/pkg/ioq3ded.sh b/misc/setup/pkg/ioq3ded.sh
index 5ed9742..5f2d7e5 100644
--- a/misc/setup/pkg/ioq3ded.sh
+++ b/misc/setup/pkg/ioq3ded.sh
@@ -2,22 +2,21 @@
 # Rev: $Id: ioq3ded.sh,v 1.9 2006/01/18 13:47:42 raistlin Exp raistlin $
 # Needed to make symlinks/shortcuts work.
 # the binaries must run with correct working directory
-#
 
 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/`
 
 EXEC_REL=release
 
-#EXEC_BIN=ioquake3.${COMPILE_ARCH}
-#EXEC_BIN=ioquake3-smp.${COMPILE_ARCH}
+# EXEC_BIN=ioquake3.${COMPILE_ARCH}
+# EXEC_BIN=ioquake3-smp.${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}
 do
diff --git a/misc/setup/pkg/ioquake3.sh b/misc/setup/pkg/ioquake3.sh
index 495d9cd..b2fe785 100644
--- a/misc/setup/pkg/ioquake3.sh
+++ b/misc/setup/pkg/ioquake3.sh
@@ -5,18 +5,18 @@
 
 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/`
 
 EXEC_REL=release
 
 EXEC_BIN=ioquake3.${COMPILE_ARCH}
-#EXEC_BIN=ioquake3-smp.${COMPILE_ARCH}
-#EXEC_BIN=ioq3ded.${COMPILE_ARCH}
+# EXEC_BIN=ioquake3-smp.${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}
 do
diff --git a/misc/setup/pkg/ioquake3d/prototype.template b/misc/setup/pkg/ioquake3d/prototype.template
index f23af77..26bd06a 100644
--- a/misc/setup/pkg/ioquake3d/prototype.template
+++ b/misc/setup/pkg/ioquake3d/prototype.template
@@ -1,6 +1,5 @@
 !default 0755 root bin
 i pkginfo
-i copyright
 i depend
 i postinstall
 i postremove