rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2024-11-22 04:11:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

MacOS-X fixes

Browse source
This commit is contained in:
Richard Allen 2012-12-22 00:40:02 +00:00
parent 834fac4692
commit 20e909f556
4 changed files with 79 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reaction/Makefile
View file

@ -1031,7 +1031,7 @@ define DO_REF_STR
$(echo_cmd) "REF_STR $<"
$(Q)rm -f $@
$(Q)echo "const char *fallbackShader_$(notdir $(basename $<)) =" >> $@
$(Q)cat $< | sed 's/\\/\\\\/;s/\t/\\t/;s/\"/\\"/;s/$$/\\n"/;s/^/"/' >> $@
$(Q)cat $< | sed 's/^/\"/;s/$$/\\n\"/' >> $@
$(Q)echo ";" >> $@
endef

2
reaction/code/rend2/glsl/lightall_fp.glsl
View file

@ -46,7 +46,9 @@ varying vec4 var_Color;
varying vec3 var_Position;
#endif
#if defined(USE_TCGEN) || defined(USE_NORMALMAP) || (defined(USE_LIGHT) && !defined(USE_FAST_LIGHT))
varying vec3 var_SampleToView;
#endif
#if !defined(USE_FAST_LIGHT)
varying vec3 var_Normal;

2
reaction/code/rend2/glsl/lightall_vp.glsl
View file

@ -65,7 +65,7 @@ varying vec2 var_DiffuseTex;
varying vec2 var_LightTex;
#endif
#if defined(USE_NORMALMAP) || defined(USE_LIGHT) && !defined(USE_FAST_LIGHT)
#if defined(USE_TCGEN) || defined(USE_NORMALMAP) || (defined(USE_LIGHT) && !defined(USE_FAST_LIGHT))
varying vec3 var_SampleToView;
#endif

129
reaction/make-macosx-ub.sh
View file

@ -8,39 +8,41 @@ ICNS=misc/quake3.icns
DESTDIR=build/release-darwin-ub
BASEDIR=Boomstick
MPACKDIR=missionpack
LANG=C
LC_ALL=C
BIN_OBJ="
build/release-darwin-ppc/Reaction.ppc
build/release-darwin-x86_64/Reaction.x86_64
build/release-darwin-i386/Reaction.i386
"
BIN_DEDOBJ="
build/release-darwin-ppc/Reactionded.ppc
build/release-darwin-x86_64/Reactionded.x86_64
build/release-darwin-i386/Reactionded.i386
"
BASE_OBJ="
build/release-darwin-ppc/$BASEDIR/cgameppc.dylib
build/release-darwin-x86_64/$BASEDIR/cgamex86_64.dylib
build/release-darwin-i386/$BASEDIR/cgamei386.dylib
build/release-darwin-ppc/$BASEDIR/uippc.dylib
build/release-darwin-x86_64/$BASEDIR/uix86_64.dylib
build/release-darwin-i386/$BASEDIR/uii386.dylib
build/release-darwin-ppc/$BASEDIR/qagameppc.dylib
build/release-darwin-x86_64/$BASEDIR/qagamex86_64.dylib
build/release-darwin-i386/$BASEDIR/qagamei386.dylib
"
MPACK_OBJ="
build/release-darwin-ppc/$MPACKDIR/cgameppc.dylib
build/release-darwin-x86_64/$MPACKDIR/cgamex86_64.dylib
build/release-darwin-i386/$MPACKDIR/cgamei386.dylib
build/release-darwin-ppc/$MPACKDIR/uippc.dylib
build/release-darwin-x86_64/$MPACKDIR/uix86_64.dylib
build/release-darwin-i386/$MPACKDIR/uii386.dylib
build/release-darwin-ppc/$MPACKDIR/qagameppc.dylib
build/release-darwin-x86_64/$MPACKDIR/qagamex86_64.dylib
build/release-darwin-i386/$MPACKDIR/qagamei386.dylib
"
RENDER_OBJ="
build/release-darwin-ppc/renderer_opengl1_smp_ppc.dylib
build/release-darwin-x86_64/renderer_opengl1_smp_x86_64.dylib
build/release-darwin-i386/renderer_opengl1_smp_i386.dylib
build/release-darwin-ppc/renderer_opengl1_ppc.dylib
build/release-darwin-x86_64/renderer_opengl1_x86_64.dylib
build/release-darwin-i386/renderer_opengl1_i386.dylib
build/release-darwin-ppc/renderer_rend2_smp_ppc.dylib
build/release-darwin-x86_64/renderer_rend2_smp_x86_64.dylib
build/release-darwin-i386/renderer_rend2_smp_i386.dylib
build/release-darwin-ppc/renderer_rend2_ppc.dylib
build/release-darwin-x86_64/renderer_rend2_x86_64.dylib
build/release-darwin-i386/renderer_rend2_i386.dylib
"
@ -52,22 +54,18 @@ fi
Q3_VERSION=`grep '^VERSION=' Makefile | sed -e 's/.*=\(.*\)/\1/'`
# We only care if we're >= 10.4, not if we're specifically Tiger.
# "8" is the Darwin major kernel version.
TIGERHOST=`uname -r |perl -w -p -e 's/\A(\d+)\..*\Z/$1/; $_ = (($_ >= 8) ? "1" : "0");'`
# we want to use the oldest available SDK for max compatiblity
unset PPC_SDK
unset PPC_CFLAGS
unset PPC_LDFLAGS
unset X86_64_SDK
unset X86_64_CFLAGS
unset X86_64_LDFLAGS
unset X86_SDK
unset X86_CFLAGS
unset X86_LDFLAGS
if [ -d /Developer/SDKs/MacOSX10.5.sdk ]; then
PPC_SDK=/Developer/SDKs/MacOSX10.5.sdk
PPC_CFLAGS="-arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk \
X86_64_SDK=/Developer/SDKs/MacOSX10.5.sdk
X86_64_CFLAGS="-arch x86_64 -isysroot /Developer/SDKs/MacOSX10.5.sdk \
-DMAC_OS_X_VERSION_MIN_REQUIRED=1050"
PPC_LDFLAGS=" -mmacosx-version-min=10.5"
X86_64_LDFLAGS=" -mmacosx-version-min=10.5"
X86_SDK=/Developer/SDKs/MacOSX10.5.sdk
X86_CFLAGS="-arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk \
@ -75,26 +73,29 @@ if [ -d /Developer/SDKs/MacOSX10.5.sdk ]; then
X86_LDFLAGS=" -mmacosx-version-min=10.5"
fi
if [ -d /Developer/SDKs/MacOSX10.4u.sdk ]; then
PPC_SDK=/Developer/SDKs/MacOSX10.4u.sdk
PPC_CFLAGS="-arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk \
-DMAC_OS_X_VERSION_MIN_REQUIRED=1040"
PPC_LDFLAGS=" -mmacosx-version-min=10.4"
# The 10.4 SDK is not 64 bit ready and can not be used to build 64bit versions.
# This makes 10.5 the minimum for UB's containing x86_64
#
#if [ -d /Developer/SDKs/MacOSX10.4u.sdk ]; then
# X86_64_SDK=/Developer/SDKs/MacOSX10.4u.sdk
# X86_64_CFLAGS="-arch x86_64 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \
# -DMAC_OS_X_VERSION_MIN_REQUIRED=1040"
# X86_64_LDFLAGS=" -mmacosx-version-min=10.4"
#
# X86_SDK=/Developer/SDKs/MacOSX10.4u.sdk
# X86_CFLAGS="-arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \
# -DMAC_OS_X_VERSION_MIN_REQUIRED=1040"
# X86_LDFLAGS=" -mmacosx-version-min=10.4"
#fi
#
#if [ -d /Developer/SDKs/MacOSX10.3.9.sdk ] && [ $TIGERHOST ]; then
# X86_64_SDK=/Developer/SDKs/MacOSX10.3.9.sdk
# X86_64_CFLAGS="-arch x86_64 -isysroot /Developer/SDKs/MacOSX10.3.9.sdk \
# -DMAC_OS_X_VERSION_MIN_REQUIRED=1030"
# X86_64_LDFLAGS=" -mmacosx-version-min=10.3"
#fi
X86_SDK=/Developer/SDKs/MacOSX10.4u.sdk
X86_CFLAGS="-arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \
-DMAC_OS_X_VERSION_MIN_REQUIRED=1040"
X86_LDFLAGS=" -mmacosx-version-min=10.4"
fi
if [ -d /Developer/SDKs/MacOSX10.3.9.sdk ] && [ $TIGERHOST ]; then
PPC_SDK=/Developer/SDKs/MacOSX10.3.9.sdk
PPC_CFLAGS="-arch ppc -isysroot /Developer/SDKs/MacOSX10.3.9.sdk \
-DMAC_OS_X_VERSION_MIN_REQUIRED=1030"
PPC_LDFLAGS=" -mmacosx-version-min=10.3"
fi
if [ -z $PPC_SDK ] || [ -z $X86_SDK ]; then
if [ -z $X86_64_SDK ] || [ -z $X86_SDK ]; then
echo "\
ERROR: This script is for building a Universal Binary. You cannot build
for a different architecture unless you have the proper Mac OS X SDKs
@ -103,17 +104,17 @@ ERROR: This script is for building a Universal Binary. You cannot build
exit 1
fi
echo "Building PPC Client/Dedicated Server against \"$PPC_SDK\""
echo "Building X86_64 Client/Dedicated Server against \"$X86_64_SDK\""
echo "Building X86 Client/Dedicated Server against \"$X86_SDK\""
if [ "$PPC_SDK" != "/Developer/SDKs/MacOSX10.3.9.sdk" ] || \
[ "$X86_SDK" != "/Developer/SDKs/MacOSX10.4u.sdk" ]; then
echo
if [ "$X86_64_SDK" != "/Developer/SDKs/MacOSX10.5.sdk" ] || \
[ "$X86_SDK" != "/Developer/SDKs/MacOSX10.5.sdk" ]; then
echo "\
WARNING: in order to build a binary with maximum compatibility you must
build on Mac OS X 10.4 using Xcode 2.3 or 2.5 and have the
MacOSX10.3.9, and MacOSX10.4u SDKs installed from the Xcode
install disk Packages folder."
fi
build on Mac OS X 10.5 using Xcode 3.1 and have the MacOSX10.5
SDKs installed from the Xcode install disk Packages folder."
sleep 3
fi
if [ ! -d $DESTDIR ]; then
mkdir -p $DESTDIR
@ -122,18 +123,22 @@ fi
# For parallel make on multicore boxes...
NCPU=`sysctl -n hw.ncpu`
# ppc client and server
if [ -d build/release-release-ppc ]; then
rm -r build/release-darwin-ppc
# x86_64 client and server
if [ -d build/release-release-x86_64 ]; then
rm -r build/release-darwin-x86_64
fi
(ARCH=ppc CC=gcc-4.0 CFLAGS=$PPC_CFLAGS LDFLAGS=$PPC_LDFLAGS make -j$NCPU) || exit 1;
(ARCH=x86_64 CC=gcc-4.0 CFLAGS=$X86_64_CFLAGS LDFLAGS=$X86_64_LDFLAGS make -j$NCPU) || exit 1;
# intel client and server
echo;echo;echo
# i386 client and server
if [ -d build/release-darwin-i386 ]; then
rm -r build/release-darwin-i386
fi
(ARCH=i386 CC=gcc-4.0 CFLAGS=$X86_CFLAGS LDFLAGS=$X86_LDFLAGS make -j$NCPU) || exit 1;
echo;echo;echo
echo "Creating .app bundle $DESTDIR/$APPBUNDLE"
if [ ! -d $DESTDIR/$APPBUNDLE/Contents/MacOS/$BASEDIR ]; then
mkdir -p $DESTDIR/$APPBUNDLE/Contents/MacOS/$BASEDIR || exit 1;
@ -183,10 +188,26 @@ echo "
</plist>
" > $DESTDIR/$APPBUNDLE/Contents/Info.plist
# Change the path of the SDL Framework in both arches for the executables and renderer dylib's
for i in $BIN_OBJ $BIN_DEDOBJ $RENDER_OBJ
do
install_name_tool -change "@rpath/SDL.framework/Versions/A/SDL" "@executable_path/../Frameworks/SDL.framework/Versions/A/SDL" $i
done
# Make UB's from previous builds of 1386 and x86_64 binaries
lipo -create -o $DESTDIR/$APPBUNDLE/Contents/MacOS/$BINARY $BIN_OBJ
lipo -create -o $DESTDIR/$APPBUNDLE/Contents/MacOS/$DEDBIN $BIN_DEDOBJ
# Embed the SDL framework into the .app so players done need to install it on their systems.
mkdir $DESTDIR/$APPBUNDLE/Contents/Frameworks
unzip -d $DESTDIR/$APPBUNDLE/Contents/Frameworks code/libs/macosx/SDL-1.2.15.framework.zip
# Change the path in the UB, just in case
install_name_tool -change "@rpath/SDL.framework/Versions/A/SDL" "@executable_path/../Frameworks/SDL.framework/Versions/A/SDL" $DESTDIR/$APPBUNDLE/Contents/MacOS/$BINARY
install_name_tool -change "@rpath/SDL.framework/Versions/A/SDL" "@executable_path/../Frameworks/SDL.framework/Versions/A/SDL" $DESTDIR/$APPBUNDLE/Contents/MacOS/$DEDBIN
cp $RENDER_OBJ $DESTDIR/$APPBUNDLE/Contents/MacOS/
cp $BASE_OBJ $DESTDIR/$APPBUNDLE/Contents/MacOS/$BASEDIR/
cp $MPACK_OBJ $DESTDIR/$APPBUNDLE/Contents/MacOS/$MPACKDIR/
#cp $MPACK_OBJ $DESTDIR/$APPBUNDLE/Contents/MacOS/$MPACKDIR/
cp code/libs/macosx/*.dylib $DESTDIR/$APPBUNDLE/Contents/MacOS/