From 72e6452d5b3c51f44fbe60a799a4123bd80697f1 Mon Sep 17 00:00:00 2001
From: Yves Rizoud <yrizoud@gmail.com>
Date: Tue, 7 Jul 2009 19:26:37 +0000
Subject: [PATCH] Integrated Makefile changes from MagerValp (Issue 188 comment
 4) for MacOSX; adapted Windows build slightly; Updated Help screens for list
 of bug finders.

git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@904 416bcca6-2ee7-4201-b75f-2eb2f807beb1
---
 Makefile   | 23 +++++++++++++----------
 helpfile.h | 17 +++++++++--------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/Makefile b/Makefile
index 0001edf3..a96d4780 100644
--- a/Makefile
+++ b/Makefile
@@ -47,8 +47,7 @@ ifdef COMSPEC
   OBJDIR = obj/win32
   # Resources (icon)
   WINDRES = windres.exe
-  OBJRES = $(OBJDIR)/winres.o
-  CFGOBJRES = $(OBJDIR)/wincfgres.o
+  PLATFORMOBJ = $(OBJDIR)/winres.o
   PLATFORM = win32
   PLATFORMFILES = SDL.dll SDL_image.dll libpng13.dll zlib1.dll gfx2.ico $(TTFLIBS) #some misc files we have to add to the release archive under windows.
   ZIP = zip
@@ -80,8 +79,12 @@ else
   ZIP = zip
   PLATFORMFILES = gfx2.png
   BIN = grafx2
-  COPT = -D__macosx__ -D__linux__-W -Wall -Wdeclaration-after-statement -O$(OPTIM) -std=c99 -c -g `sdl-config --cflags` $(TTFCOPT) -I/usr/X11/include
-  LOPT = `sdl-config --libs` -framework SDL_image -framework SDL_ttf -L/usr/X11/lib -R/usr/X11/lib -lpng
+  # Where the SDL frameworks are located
+  FWDIR = /Library/Frameworks
+  SDLCOPT = -arch i386 -I$(FWDIR)/SDL.framework/Headers -I$(FWDIR)/SDL_image.framework/Headers -I$(FWDIR)/SDL_ttf.framework/Headers -D_THREAD_SAFE
+  SDLLOPT = -arch i386 -L/usr/lib -framework SDL -framework SDL_image -framework SDL_ttf -framework Cocoa -framework Carbon -framework OpenGL
+  COPT = -D__macosx__ -D__linux__ -W -Wall -Wdeclaration-after-statement -O$(OPTIM) -std=c99 -c -g $(SDLCOPT) $(TTFCOPT) -I/usr/X11/include
+  LOPT = $(SDLLOPT) -L/usr/X11/lib -R/usr/X11/lib -lpng
   	# Use gcc for compiling. Use ncc to build a callgraph and analyze the code.
   	CC = gcc
   	#CC = nccgen -ncgcc -ncld -ncfabs
@@ -262,9 +265,9 @@ $(MACAPPEXE) : $(BIN)
 	cp -r skins Grafx2.app/Contents/Resources
 	cp -r gfx2.cfg Grafx2.app/Contents/Resources
 	cp -r gfx2def.ini Grafx2.app/Contents/Resources
-	cp -Rp /Library/Frameworks/SDL.framework Grafx2.app/Contents/Frameworks
-	cp -Rp /Library/Frameworks/SDL_image.framework Grafx2.app/Contents/Frameworks
-	cp -Rp /Library/Frameworks/SDL_ttf.framework Grafx2.app/Contents/Frameworks
+	cp -Rp $(FWDIR)/SDL.framework Grafx2.app/Contents/Frameworks
+	cp -Rp $(FWDIR)/SDL_image.framework Grafx2.app/Contents/Frameworks
+	cp -Rp $(FWDIR)/SDL_ttf.framework Grafx2.app/Contents/Frameworks
 	cp $(BIN) $(MACAPPEXE)
 else
 all : $(BIN)
@@ -289,8 +292,8 @@ ziprelease: version $(BIN) release
 
 testsed :
 
-$(BIN) : $(OBJ) $(OBJRES)
-	$(CC) $(OBJ) $(OBJRES) -o $(BIN) $(LOPT)
+$(BIN) : $(OBJ)
+	$(CC) $(OBJ) -o $(BIN) $(LOPT)
 
 # SVN revision number
 version.c :
@@ -328,7 +331,7 @@ $(OBJDIR)/winres.o : gfx2.ico
 	echo "1 ICON \"gfx2.ico\"" | $(WINDRES) -o $(OBJDIR)/winres.o
 
 clean :
-	$(DELCOMMAND) $(OBJ) $(OBJDIR)/version.o $(OBJRES)
+	$(DELCOMMAND) $(OBJ)
 	$(DELCOMMAND) $(BIN)
 
 # Linux installation of the program
diff --git a/helpfile.h b/helpfile.h
index 47e7c14e..2ad00968 100644
--- a/helpfile.h
+++ b/helpfile.h
@@ -342,14 +342,15 @@ static const T_Help_table helptable_credits[] =
   HELP_TITLE(" BUGFINDERS")
   HELP_TEXT ("")
 //HELP_TEXT ("0----5----0----5----0----5----0----5----0--X")
-  HELP_TEXT ("  BDCIron        Ced           El Topo      ")
-  HELP_TEXT ("  fallenblood    Frost         Grimmy       ")
-  HELP_TEXT ("  Gürkan Sengün  HoraK-FDF     iLKke        ")
-  HELP_TEXT ("  keito          kusma         Lord Graga   ")
-  HELP_TEXT ("  MagerValp      mind          MooZ         ")
-  HELP_TEXT ("  the Peach      richienyhus   TeeEmCee     ")
-  HELP_TEXT ("  tempest        Timo Kurrpa   titus^Rab    ")
-  HELP_TEXT ("  Tobé           00ai99        ")
+  HELP_TEXT ("  blumunkee     BDCIron         Ced         ")
+  HELP_TEXT ("  El Topo       fallenblood     Frost       ")
+  HELP_TEXT ("  Grimmy        Gürkan Sengün   HoraK-FDF   ")
+  HELP_TEXT ("  iLKke         Jamon           keito       ")
+  HELP_TEXT ("  kusma         Lord Graga      MagerValp   ")
+  HELP_TEXT ("  mind          MooZ            the Peach   ")
+  HELP_TEXT ("  richienyhus   tape.wyrm       TeeEmCee    ")
+  HELP_TEXT ("  tempest       Timo Kurrpa     titus^Rab   ")
+  HELP_TEXT ("  Tobé          00ai99                      ")
   HELP_TEXT ("")
   HELP_TEXT ("  ... posted the annoying bug reports.")
   HELP_TEXT ("")