ubergames
/
rpgxef
mirror of https://github.com/UberGames/rpgxEF.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes and OS X compile 

- Fixed new client window icon
- Modified OS X make shell scripts
This commit is contained in:
Walter Hennecke 2012-01-26 13:30:54 +01:00
parent 356413e1c4
commit 8571cebfa4
3 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
code/sdl/sdl_icon.h
View File

@ -134,11 +134,11 @@ static const struct {
/* GIMP RGBA C-Source image dump (rpgxef.c) */ /* GIMP RGBA C-Source image dump (rpgxef.c) */
static const struct { static const struct {
guint width; unsigned int width;
guint height; unsigned int height;
guint bytes_per_pixel; /* 3:RGB, 4:RGBA */ unsigned int bytes_per_pixel; /* 3:RGB, 4:RGBA */
guint8 pixel_data[32 * 32 * 4 + 1]; unsigned char pixel_data[32 * 32 * 4 + 1];
} gimp_image = { } CLIENT_WINDOW_ICON = {
32, 32, 4, 32, 32, 4,
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"

24
make-macosx-ub.sh
View File

@ -1,20 +1,20 @@
#!/bin/sh #!/bin/sh
APPBUNDLE=ioquake3.app APPBUNDLE=rpgxEF.app
BINARY=ioquake3.ub BINARY=rpgxEF.ub
DEDBIN=ioq3ded.ub DEDBIN=rpgxEFded.ub
PKGINFO=APPLIOQ3 PKGINFO=APPLRPGXEF
ICNS=misc/quake3.icns ICNS=misc/quake3.icns
DESTDIR=build/release-darwin-ub DESTDIR=build/release-darwin-ub
BASEDIR=baseq3 BASEDIR=baseq3
MPACKDIR=missionpack MPACKDIR=missionpack
BIN_OBJ=" BIN_OBJ="
build/release-darwin-ppc/ioquake3-smp.ppc build/release-darwin-ppc/rpgxEF-smp.ppc
build/release-darwin-i386/ioquake3-smp.i386 build/release-darwin-i386/rpgxEF-smp.i386
" "
BIN_DEDOBJ=" BIN_DEDOBJ="
build/release-darwin-ppc/ioq3ded.ppc build/release-darwin-ppc/rpgxEFded.ppc
build/release-darwin-i386/ioq3ded.i386 build/release-darwin-i386/rpgxEFded.i386
" "
BASE_OBJ=" BASE_OBJ="
build/release-darwin-ppc/$BASEDIR/cgameppc.dylib build/release-darwin-ppc/$BASEDIR/cgameppc.dylib
@ -35,7 +35,7 @@ MPACK_OBJ="
cd `dirname $0` cd `dirname $0`
if [ ! -f Makefile ]; then if [ ! -f Makefile ]; then
echo "This script must be run from the ioquake3 build directory" echo "This script must be run from the rpgxEF build directory"
exit 1 exit 1
fi fi
@ -147,15 +147,15 @@ echo "
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>$BINARY</string> <string>$BINARY</string>
<key>CFBundleGetInfoString</key> <key>CFBundleGetInfoString</key>
<string>ioquake3 $Q3_VERSION</string> <string>rpgxEF $Q3_VERSION</string>
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>ioquake3.icns</string> <string>ioquake3.icns</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>org.ioquake.ioquake3</string> <string>org.rpgxEF.rpgxEF</string>
<key>CFBundleInfoDictionaryVersion</key> <key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string> <string>6.0</string>
<key>CFBundleName</key> <key>CFBundleName</key>
<string>ioquake3</string> <string>rpgxEF</string>
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>

21
make-macosx.sh Normal file → Executable file
View File

@ -1,8 +1,8 @@
#!/bin/sh #!/bin/sh
APPBUNDLE=ioquake3.app APPBUNDLE=rpgxEF.app
BINARY=ioquake3.x86_64 BINARY=rpgxEF.x86_64
DEDBIN=ioq3ded.x86_64 DEDBIN=rpgxEFded.x86_64
PKGINFO=APPLIOQ3 PKGINFO=APPLRPGXEF
ICNS=misc/quake3.icns ICNS=misc/quake3.icns
DESTDIR=build/release-darwin-x86_64 DESTDIR=build/release-darwin-x86_64
BASEDIR=baseq3 BASEDIR=baseq3
@ -10,10 +10,10 @@ MPACKDIR=missionpack
RENDERDIR=build/release-darwin-x86_64 RENDERDIR=build/release-darwin-x86_64
BIN_OBJ=" BIN_OBJ="
build/release-darwin-x86_64/ioquake3.x86_64 build/release-darwin-x86_64/rpgxEF.x86_64
" "
BIN_DEDOBJ=" BIN_DEDOBJ="
build/release-darwin-x86_64/ioq3ded.x86_64 build/release-darwin-x86_64/rpgxEFded.x86_64
" "
BASE_OBJ=" BASE_OBJ="
build/release-darwin-x86_64/$BASEDIR/cgamex86_64.dylib build/release-darwin-x86_64/$BASEDIR/cgamex86_64.dylib
@ -33,7 +33,7 @@ RENDER_OBJ="
cd `dirname $0` cd `dirname $0`
if [ ! -f Makefile ]; then if [ ! -f Makefile ]; then
echo "This script must be run from the ioquake3 build directory" echo "This script must be run from the rpgxEF build directory"
exit 1 exit 1
fi fi
@ -69,6 +69,7 @@ NCPU=`sysctl -n hw.ncpu`
# intel client and server # intel client and server
if [ -d build/release-darwin-x86_64 ]; then if [ -d build/release-darwin-x86_64 ]; then
rm -r build/release-darwin-x86_64 rm -r build/release-darwin-x86_64
fi fi
(ARCH=x86_64 CFLAGS=$X86_CFLAGS LDFLAGS=$X86_LDFLAGS make -j$NCPU) || exit 1; (ARCH=x86_64 CFLAGS=$X86_CFLAGS LDFLAGS=$X86_LDFLAGS make -j$NCPU) || exit 1;
@ -96,15 +97,15 @@ echo "
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>$BINARY</string> <string>$BINARY</string>
<key>CFBundleGetInfoString</key> <key>CFBundleGetInfoString</key>
<string>ioquake3 $Q3_VERSION</string> <string>rpgxEF $Q3_VERSION</string>
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>ioquake3.icns</string> <string>ioquake3.icns</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>org.ioquake.ioquake3</string> <string>org.rpgxEF.rpgxEF</string>
<key>CFBundleInfoDictionaryVersion</key> <key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string> <string>6.0</string>
<key>CFBundleName</key> <key>CFBundleName</key>
<string>ioquake3</string> <string>rpgxEF</string>
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>