From 8ea1ab7fc86f4ce6349616e7fcc867e571ae8184 Mon Sep 17 00:00:00 2001 From: Franck Charlet Date: Mon, 20 Feb 2012 19:56:52 +0000 Subject: [PATCH] fixed makefile for macosx again git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1905 416bcca6-2ee7-4201-b75f-2eb2f807beb1 --- src/.DS_Store | Bin 24580 -> 24580 bytes src/Makefile | 30 +++++++++++++++++++++++++----- src/buttons.c | 2 +- src/helpfile.h | 2 +- src/text.c | 1 - 5 files changed, 27 insertions(+), 8 deletions(-) diff --git a/src/.DS_Store b/src/.DS_Store index 0be3b5309f69205baf9abc5973f128efed2ea8ca..1bcee85d50dc6cc59119f6527fa2f35feb8d8458 100644 GIT binary patch delta 712 zcmZoUz}Rwtae}|-Mg|5376t|Z28JAl0){k(Ody>)S&(V*WCIr#Rwj__rPH()SE155C{^u0u+$i%)-RZ$LKJbM?emtC|V#KnIkg!yMQx7AY1S_jH5sK zrI5hnQlTZ2rwR#84mNYzEG_(vk(UGLmI{VKhEj$^hLp()Le857MI*QvZ71_6_`$U5 zPVQFlMsU~_@54CylO>hF4urUPw$c)HE{0@=e4y9z8H#`~l_7;ek0B#7FD*YQCqD`3 zNdpE3sE2eX+bbiC-Mm|QHY?0r-OcTqtc*Zj=&sEZwB(pT;-E0loqS&htOdl;-yEx} z#59?c$%4^n@&$d<$-<05KrA%*t04bm0|O(7CI@T%$-IVKljk#9Lrez>Z00qz1(^;p zb91$kJ=g|_CtjQQLllCn`)?|>xz#iktQaCKZ4M6bE0aM6FEw|C8#7tj;w^*&lCib~ z%Ul9G`m?3-6jL>L`vB{uoHRhcpeIJi=P=^>S&7;9i%2HLfVhk>0T9T=jC zzzEBj++ZX=xm8CKVL7&NG1<)S@Qr11rHLcLR>HpH1BDAPq8J$1fS6^opvPzNi4D8} DV?Obm delta 519 zcmb7>IY}#09fhd|Kn#h4P>mRynDS4&j9CY#+(ng~;B->Gd42?82CXWjEy=&+{i9^{%NDOU(;tZ<$A9-OX>@ Z|1mHr{V8J2Zv87w!1=d=LT2=SDc^(HvULCe diff --git a/src/Makefile b/src/Makefile index 9256a70a..38d97a55 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,6 +1,6 @@ # Grafx2 - The Ultimate 256-color bitmap paint program # -# Copyright 2011 Franck Charlet +# Copyright 2012 Franck Charlet # Copyright 2011 Pawel Góralski # Copyright 2009 Per Olofsson # Copyright 2008 Peter Gordon @@ -32,11 +32,18 @@ # Compile with OPTIM=0 to disable gcc optimizations, to enable debug. STRIP = strip -### Specific to build MAC OS X universal binaries on Lion ### -### (may need to be changed or removed depedning on the OSX version) ### +### Specific to build MAC OS X universal binaries on Tiger or Lion ### +### (may need to be changed or removed depending on the OSX version) ### +#MACOSX_LION = 1 + +ifdef MACOSX_LION MACOSX_SYSROOT = /Developer/SDKs/MacOSX10.6.sdk MACOSX_ARCH = -arch x86_64 -arch i386 +else +MACOSX_SYSROOT = /Developer/SDKs/MacOSX10.4u.sdk +MACOSX_ARCH = -arch ppc -arch i386 +endif ### PLATFORM DETECTION AND CONFIGURATION ### @@ -109,12 +116,19 @@ else SDLLOPT = -isysroot $(MACOSX_SYSROOT) $(MACOSX_ARCH) -L/usr/lib -framework SDL -framework SDL_image -framework Cocoa -framework Carbon -framework OpenGL SDLCOPT = $(MACOSX_ARCH) -I$(FWDIR)/SDL.framework/Headers -I$(FWDIR)/SDL_image.framework/Headers -I$(FWDIR)/SDL_ttf.framework/Headers -D_THREAD_SAFE LUACOPT = -I$(FWDIR)/Lua.framework/Headers +ifdef MACOSX_LION LUALOPT = -framework lua - +else + LUALOPT = -llua +endif # 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 +ifdef MACOSX_LION LOPT = $(SDLLOPT) $(LUALOPT) -framework libpng14 -lz +else + LOPT = $(SDLLOPT) $(LUALOPT) -lpng -lz +endif # Use gcc for compiling. Use ncc to build a callgraph and analyze the code. CC = gcc #CC = nccgen -ncgcc -ncld -ncfabs @@ -458,13 +472,17 @@ $(MACAPPEXE) : $(BIN) cp -r ../share/grafx2/scripts/samples_2.4/libs Grafx2.app/Contents/Resources/scripts/samples_2.4 cp -r ../share/grafx2/scripts/samples_2.4/palette Grafx2.app/Contents/Resources/scripts/samples_2.4 cp -r ../share/grafx2/scripts/samples_2.4/picture Grafx2.app/Contents/Resources/scripts/samples_2.4 +ifdef MACOSX_LION mkdir -p Grafx2.app/Contents/Frameworks/Lua.framework/Versions mkdir -p Grafx2.app/Contents/Frameworks/libpng14.framework/Versions +endif mkdir -p Grafx2.app/Contents/Frameworks/SDL.framework/Versions mkdir -p Grafx2.app/Contents/Frameworks/SDL_image.framework/Versions # mkdir -p Grafx2.app/Contents/Frameworks/SDL_ttf.framework/Versions +ifdef MACOSX_LION cp -Rp $(FWDIR)/Lua.framework/Versions/A Grafx2.app/Contents/Frameworks/Lua.framework/Versions cp -Rp $(FWDIR)/libpng14.framework/Versions/1.4.8 Grafx2.app/Contents/Frameworks/libpng14.framework/Versions +endif cp -Rp $(FWDIR)/SDL.framework/Versions/A Grafx2.app/Contents/Frameworks/SDL.framework/Versions cp -Rp $(FWDIR)/SDL_image.framework/Versions/A Grafx2.app/Contents/Frameworks/SDL_image.framework/Versions # cp -Rp $(FWDIR)/SDL_ttf.framework/Versions/A Grafx2.app/Contents/Frameworks/SDL_ttf.framework/Versions @@ -473,11 +491,13 @@ $(MACAPPEXE) : $(BIN) rm -fr Grafx2.app/Contents/Frameworks/SDL.framework/Versions/A/Resources rm -fr Grafx2.app/Contents/Frameworks/SDL_image.framework/Versions/A/Headers rm -fr Grafx2.app/Contents/Frameworks/SDL_image.framework/Versions/A/Resources +ifdef MACOSX_LION rm -fr Grafx2.app/Contents/Frameworks/Lua.framework/Versions/A/Resources rm -fr Grafx2.app/Contents/Frameworks/Lua.framework/Versions/A/Headers rm -fr Grafx2.app/Contents/Frameworks/libpng14.framework/Versions/1.4.8/Resources rm -fr Grafx2.app/Contents/Frameworks/libpng14.framework/Versions/1.4.8/Headers -# rm -fr Grafx2.app/Contents/Frameworks/SDL_ttf.framework/Versions + rm -fr Grafx2.app/Contents/Frameworks/SDL_ttf.framework/Versions +endif cp $(BIN) $(MACAPPEXE) $(STRIP) -x -X -S $(MACAPPEXE) chmod +x $(MACAPPEXE) diff --git a/src/buttons.c b/src/buttons.c index 0ea6dab4..65181850 100644 --- a/src/buttons.c +++ b/src/buttons.c @@ -163,7 +163,7 @@ void Button_Message_initial(void) for (x=14,x_pos=0; x_pos<231; x_pos++,x++) Pixel_in_window(x,y,Gfx->Logo_grafx2[offs_y+x_pos]); - Print_in_window(130-4*26,88,"Copyright (c) 2007-2011 by",MC_Dark,MC_Light); + Print_in_window(130-4*26,88,"Copyright (c) 2007-2012 by",MC_Dark,MC_Light); Print_in_window(130-4*23,96,"the Grafx2 project team",MC_Black,MC_Light); Print_in_window(130-4*26,112,"Copyright (c) 1996-2001 by",MC_Dark,MC_Light); Print_in_window(130-4*13,120,"Sunset Design",MC_Black,MC_Light); diff --git a/src/helpfile.h b/src/helpfile.h index 4648d000..a367faec 100644 --- a/src/helpfile.h +++ b/src/helpfile.h @@ -67,7 +67,7 @@ static const T_Help_table helptable_about[] = #else HELP_TEXT ("") #endif - HELP_TEXT ("Copyright 2007-2011, the Grafx2 project team") + HELP_TEXT ("Copyright 2007-2012, the Grafx2 project team") HELP_TEXT (" Copyright 1996-2001, SUNSET DESIGN") }; static const T_Help_table helptable_licence[] = diff --git a/src/text.c b/src/text.c index 9c0258c6..54d59f47 100644 --- a/src/text.c +++ b/src/text.c @@ -45,7 +45,6 @@ #endif #if defined(__macosx__) - #include #import #import #endif