From e23679c13468a86c6d7f0f3ec3762d3417b80172 Mon Sep 17 00:00:00 2001
From: David Schmidt <david__schmidt@users.sf.net>
Date: Sun, 26 Feb 2012 21:00:06 +0000
Subject: [PATCH] Fixing up the Mac build to be compatible with ppc and intel
 all in one go

---
 src/Makefile |  3 ++-
 src/vars_mac | 12 +++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index ac5fdce..a722a1f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -23,6 +23,7 @@ clean:
 	- rm 8inst_c.h
 	- rm 16inst_c.h
 	- rm -r ../GSport.app
+	- rm -r ../GSportDmg
 
 specials: 8inst_s 16inst_s 8size 16size 8inst_c 16inst_c size_c size_s
 
@@ -32,7 +33,7 @@ specials_clean:
 
 # Mac builds:
 gsportmac: $(OBJECTS) compile_time.o
-	g++ $(CCOPTS) $(LDOPTS) -arch $(ARCH) $(OBJECTS) compile_time.o $(LDFLAGS) -o gsport $(EXTRA_LIBS) -prebind -framework Carbon -framework Quicktime
+	$(CC) $(CCOPTS) $(LDOPTS) $(OBJECTS) compile_time.o $(LDFLAGS) -o gsport $(EXTRA_LIBS)
 	mkdir -p ../GSport.app/Contents/Resources/English.lproj/main.nib
 	mkdir -p ../GSport.app/Contents/MacOS
 	mv gsport ../GSport.app/Contents/MacOS/GSport
diff --git a/src/vars_mac b/src/vars_mac
index 5747d02..4ae86cd 100644
--- a/src/vars_mac
+++ b/src/vars_mac
@@ -1,11 +1,13 @@
-
+CC = /usr/bin/g++-4.0
+ARCH = -arch i386 -arch ppc
+SDK = /Developer/SDKs/MacOSX10.4u.sdk
 TARGET = gsportmac
 OBJECTS = $(OBJECTS1) scc_macdriver.o macsnd_driver.o macdriver_generic.o macdriver_console.o
-CCOPTS = -O2 -DMAC
+CCOPTS = -O2 -DMAC $(ARCH) -isysroot $(SDK)
+CPPOPTS = $(ARCH) -isysroot $(SDK)
 SUFFIX =
 NAME = gsportmac
-ARCH = ppc
 
-XOPTS = -Wall -fpascal-strings -mdynamic-no-pic -arch $(ARCH)
+XOPTS = -Wall -fpascal-strings -mdynamic-no-pic
 XLIBS =
-
+LDOPTS = -I. -prebind -framework Carbon -framework Quicktime