From 8571cebfa4af61db484648ab1e896307b7a89d24 Mon Sep 17 00:00:00 2001
From: Walter Hennecke <walter.julius@hennecke-online.net>
Date: Thu, 26 Jan 2012 13:30:54 +0100
Subject: [PATCH] Fixes and OS X compile

- Fixed new client window icon
- Modified OS X make shell scripts
---
 code/sdl/sdl_icon.h | 10 +++++-----
 make-macosx-ub.sh   | 24 ++++++++++++------------
 make-macosx.sh      | 21 +++++++++++----------
 3 files changed, 28 insertions(+), 27 deletions(-)
 mode change 100644 => 100755 make-macosx.sh

diff --git a/code/sdl/sdl_icon.h b/code/sdl/sdl_icon.h
index b285ce8..63a48d2 100644
--- a/code/sdl/sdl_icon.h
+++ b/code/sdl/sdl_icon.h
@@ -134,11 +134,11 @@ static const struct {
 /* GIMP RGBA C-Source image dump (rpgxef.c) */
 
 static const struct {
-  guint  	 width;
-  guint  	 height;
-  guint  	 bytes_per_pixel; /* 3:RGB, 4:RGBA */ 
-  guint8 	 pixel_data[32 * 32 * 4 + 1];
-} gimp_image = {
+  unsigned int 	 width;
+  unsigned int 	 height;
+  unsigned int	 bytes_per_pixel; /* 3:RGB, 4:RGBA */ 
+  unsigned char  pixel_data[32 * 32 * 4 + 1];
+} CLIENT_WINDOW_ICON = {
   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"
diff --git a/make-macosx-ub.sh b/make-macosx-ub.sh
index 0066682..fcb00b6 100644
--- a/make-macosx-ub.sh
+++ b/make-macosx-ub.sh
@@ -1,20 +1,20 @@
 #!/bin/sh
-APPBUNDLE=ioquake3.app
-BINARY=ioquake3.ub
-DEDBIN=ioq3ded.ub
-PKGINFO=APPLIOQ3
+APPBUNDLE=rpgxEF.app
+BINARY=rpgxEF.ub
+DEDBIN=rpgxEFded.ub
+PKGINFO=APPLRPGXEF
 ICNS=misc/quake3.icns
 DESTDIR=build/release-darwin-ub
 BASEDIR=baseq3
 MPACKDIR=missionpack
 
 BIN_OBJ="
-	build/release-darwin-ppc/ioquake3-smp.ppc
-	build/release-darwin-i386/ioquake3-smp.i386
+	build/release-darwin-ppc/rpgxEF-smp.ppc
+	build/release-darwin-i386/rpgxEF-smp.i386
 "
 BIN_DEDOBJ="
-	build/release-darwin-ppc/ioq3ded.ppc
-	build/release-darwin-i386/ioq3ded.i386
+	build/release-darwin-ppc/rpgxEFded.ppc
+	build/release-darwin-i386/rpgxEFded.i386
 "
 BASE_OBJ="
 	build/release-darwin-ppc/$BASEDIR/cgameppc.dylib
@@ -35,7 +35,7 @@ MPACK_OBJ="
 
 cd `dirname $0`
 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
 fi
 
@@ -147,15 +147,15 @@ echo "
 		<key>CFBundleExecutable</key>
 		<string>$BINARY</string>
 		<key>CFBundleGetInfoString</key>
-		<string>ioquake3 $Q3_VERSION</string>
+		<string>rpgxEF $Q3_VERSION</string>
 		<key>CFBundleIconFile</key>
 		<string>ioquake3.icns</string>
 		<key>CFBundleIdentifier</key>
-		<string>org.ioquake.ioquake3</string>
+		<string>org.rpgxEF.rpgxEF</string>
 		<key>CFBundleInfoDictionaryVersion</key>
 		<string>6.0</string>
 		<key>CFBundleName</key>
-		<string>ioquake3</string>
+		<string>rpgxEF</string>
 		<key>CFBundlePackageType</key>
 		<string>APPL</string>
 		<key>CFBundleShortVersionString</key>
diff --git a/make-macosx.sh b/make-macosx.sh
old mode 100644
new mode 100755
index c3ed534..03d53a0
--- a/make-macosx.sh
+++ b/make-macosx.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
-APPBUNDLE=ioquake3.app
-BINARY=ioquake3.x86_64
-DEDBIN=ioq3ded.x86_64
-PKGINFO=APPLIOQ3
+APPBUNDLE=rpgxEF.app
+BINARY=rpgxEF.x86_64
+DEDBIN=rpgxEFded.x86_64
+PKGINFO=APPLRPGXEF
 ICNS=misc/quake3.icns
 DESTDIR=build/release-darwin-x86_64
 BASEDIR=baseq3
@@ -10,10 +10,10 @@ MPACKDIR=missionpack
 RENDERDIR=build/release-darwin-x86_64
 
 BIN_OBJ="
-	build/release-darwin-x86_64/ioquake3.x86_64
+	build/release-darwin-x86_64/rpgxEF.x86_64
 "
 BIN_DEDOBJ="
-	build/release-darwin-x86_64/ioq3ded.x86_64
+	build/release-darwin-x86_64/rpgxEFded.x86_64
 "
 BASE_OBJ="
 	build/release-darwin-x86_64/$BASEDIR/cgamex86_64.dylib
@@ -33,7 +33,7 @@ RENDER_OBJ="
 
 cd `dirname $0`
 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
 fi
 
@@ -69,6 +69,7 @@ NCPU=`sysctl -n hw.ncpu`
 # intel client and server
 if [ -d build/release-darwin-x86_64 ]; then
 	rm -r build/release-darwin-x86_64
+
 fi
 (ARCH=x86_64 CFLAGS=$X86_CFLAGS LDFLAGS=$X86_LDFLAGS make -j$NCPU) || exit 1;
 
@@ -96,15 +97,15 @@ echo "
 		<key>CFBundleExecutable</key>
 		<string>$BINARY</string>
 		<key>CFBundleGetInfoString</key>
-		<string>ioquake3 $Q3_VERSION</string>
+		<string>rpgxEF $Q3_VERSION</string>
 		<key>CFBundleIconFile</key>
 		<string>ioquake3.icns</string>
 		<key>CFBundleIdentifier</key>
-		<string>org.ioquake.ioquake3</string>
+		<string>org.rpgxEF.rpgxEF</string>
 		<key>CFBundleInfoDictionaryVersion</key>
 		<string>6.0</string>
 		<key>CFBundleName</key>
-		<string>ioquake3</string>
+		<string>rpgxEF</string>
 		<key>CFBundlePackageType</key>
 		<string>APPL</string>
 		<key>CFBundleShortVersionString</key>