From 5a8d016691cd9f76a061f2fd5e9ee30fc77072ef Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Sun, 8 Jan 2012 20:32:02 +0000
Subject: [PATCH] Fix Makefile for Mac OS X:  * Switch to Mac OS X Lion
 (doesn't xhange much, if someone still wants to do a build on Tiger for PPC
 support it's easy)  * Cleanup things that got messed up by the $(shell)
 changes  * Add some comments that can be uncommented when building with
 MacPorts, instead of the more official OSX frameworks. This seems easier to
 setup, but does not provide portable binaries (the SDL framework can't be
 embedded in the app).

Many thanks to Rikard Lang for giving access to an OSX computer so I could debug stuff!


git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1892 416bcca6-2ee7-4201-b75f-2eb2f807beb1
---
 src/Makefile | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 4b65c4b4..004c59f9 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -32,11 +32,11 @@
 # Compile with OPTIM=0 to disable gcc optimizations, to enable debug.
   STRIP = strip
 
-### Specific to build MAC OS X universal binaries on Tiger ###
+### Specific to build MAC OS X universal binaries on Lion ###
 ### (may need to be changed or removed depedning on the OSX version) ###
 
-MACOSX_SYSROOT = /Developer/SDKs/MacOSX10.4u.sdk
-MACOSX_ARCH = -arch ppc -arch i386
+MACOSX_SYSROOT = /Developer/SDKs/MacOSX10.6.sdk
+MACOSX_ARCH = -arch x86_64 -arch i386
 
 ### PLATFORM DETECTION AND CONFIGURATION ###
 
@@ -97,11 +97,24 @@ else
     FWDIR = /Library/Frameworks
     BIN = ../bin/grafx2
     SVN_REVISION = $(shell svnversion | cut -f2 -d ":" - | tr -d "M")
-    SDLCOPT = $(MACOSX_ARCH) -I$(FWDIR)/SDL.framework/Headers -I$(FWDIR)/SDL_image.framework/Headers -I$(FWDIR)/SDL_ttf.framework/Headers -D_THREAD_SAFE
+
+    # these are for use with macports
+    #SDLCOPT = $(shell sdl-config --cflags)
+    #SDLLOPT = $(shell sdl-config --libs) $(shell pkg-config --libs SDL_image)
+    #LUACOPT = $(shell pkg-config lua --cflags --silence-errors ||pkg-config lua5.1 --cflags --silence-errors ||pkg-config lua-5.1 --cflags)
+    #LUALOPT = $(shell pkg-config lua --libs --silence-errors ||pkg-config lua5.1 --libs --silence-errors ||pkg-config lua-5.1 --libs)
+
+    # these are for use with Mac OS X native frameworks
     #-framework SDL_ttf 
     SDLLOPT = -isysroot $(MACOSX_SYSROOT) $(MACOSX_ARCH) -L/usr/lib -framework SDL -framework SDL_image -framework Cocoa -framework Carbon -framework OpenGL
-    COPT = -D_DARWIN_C_SOURCE -D__macosx__ -D__linux__ -W -Wall -Wdeclaration-after-statement -O$(OPTIM) -std=c99 -c -g $(LUACOPT) $(shell sdlCOPT) $(TTFCOPT) -I/usr/X11/include
-    LOPT = $(shell sdlLOPT) -llua -lpng -lz
+    SDLCOPT = $(MACOSX_ARCH) -I$(FWDIR)/SDL.framework/Headers -I$(FWDIR)/SDL_image.framework/Headers -I$(FWDIR)/SDL_ttf.framework/Headers -D_THREAD_SAFE
+    LUACOPT =
+    LUALOPT = 
+
+
+    # these are for everyone
+    COPT = -D_DARWIN_C_SOURCE -D__macosx__ -D__linux__ -W -Wall -Wdeclaration-after-statement -O$(OPTIM) -std=c99 -c -g $(LUACOPT) $(SDLCOPT) $(TTFCOPT) -I/usr/X11/include
+    LOPT = $(SDLLOPT) $(LUALOPT) -lpng -lz
     # Use gcc for compiling. Use ncc to build a callgraph and analyze the code.
     CC = gcc
     #CC = nccgen -ncgcc -ncld -ncfabs