From 431484914e84e1e7fa67b31b99da35dcc4666489 Mon Sep 17 00:00:00 2001 From: Franck Charlet Date: Thu, 10 Mar 2011 22:16:42 +0000 Subject: [PATCH] more work done on Mac OSX version git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1752 416bcca6-2ee7-4201-b75f-2eb2f807beb1 --- Info.plist | 2 +- src/.DS_Store | Bin 21508 -> 21508 bytes src/Grafx2.icns | Bin 0 -> 15824 bytes src/Makefile | 17 +++++++++++++---- src/buttons.c | 2 +- src/fileformats.c | 3 +++ src/helpfile.h | 2 +- 7 files changed, 19 insertions(+), 7 deletions(-) create mode 100755 src/Grafx2.icns diff --git a/Info.plist b/Info.plist index b5d2a5aa..b2bfa1c1 100644 --- a/Info.plist +++ b/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable Grafx2 CFBundleIconFile - + Grafx2.icns CFBundleIdentifier com.googlecode.grafx2 CFBundleInfoDictionaryVersion diff --git a/src/.DS_Store b/src/.DS_Store index 099fb4721c4cfba42cfeb65bda70b5ee7d2278e3..6f0fb88d3ef427d0597c2df68b9fad8040d488a5 100644 GIT binary patch delta 352 zcmZut!AiqG6r43FO-V{y#9kB{NTCry+Y&HG5wv*p;=M_<6r&M~*xpMI^~tZf3tRb8-DX2R)hu;adoBxCS@u9%Enz_Q7+q?I2yux~t{XWITPAvZME`I9C{Ds4 zPJ%1~gS`QziTZNpTK79&FCeyM?4|0l S`LR;}-%!>3&vj+{W#b3sxlarL delta 214 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 literal 0 HcmV?d00001 diff --git a/src/Makefile b/src/Makefile index ae96bb97..79cc11ba 100644 --- a/src/Makefile +++ b/src/Makefile @@ -32,6 +32,10 @@ # Compile with OPTIM=0 to disable gcc optimizations, to enable debug. STRIP = strip +### Specific to build MAC OS X universal binaries on Tiger ### +### (may need to be changed on your OS) ### + +MACOSX_SYSROOT = /Developer/SDKs/MacOSX10.4u.sdk ### PLATFORM DETECTION AND CONFIGURATION ### @@ -83,17 +87,19 @@ else DELCOMMAND = rm -rf MKDIR = mkdir -p RMDIR = rmdir + # Force it + #OPTIM = 3 CP = cp ZIP = zip PLATFORMFILES = gfx2.png - BIN = ../bin/grafx2 # Where the SDL frameworks are located FWDIR = /Library/Frameworks - SDLCOPT = -arch ppc -I$(FWDIR)/SDL.framework/Headers -I$(FWDIR)/SDL_image.framework/Headers -I$(FWDIR)/SDL_ttf.framework/Headers -D_THREAD_SAFE + BIN = ../bin/grafx2 + SDLCOPT = -arch ppc -arch i386 -I$(FWDIR)/SDL.framework/Headers -I$(FWDIR)/SDL_image.framework/Headers -I$(FWDIR)/SDL_ttf.framework/Headers -D_THREAD_SAFE #-framework SDL_ttf - SDLLOPT = -arch ppc -L/usr/lib -framework SDL -framework SDL_image -framework Cocoa -framework Carbon -framework OpenGL + SDLLOPT = -isysroot $(MACOSX_SYSROOT) -arch ppc -arch i386 -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 $(SDLCOPT) $(TTFCOPT) -I/usr/X11/include - LOPT = $(SDLLOPT) -lpng + LOPT = $(SDLLOPT) -lpng -lz # Use gcc for compiling. Use ncc to build a callgraph and analyze the code. CC = gcc #CC = nccgen -ncgcc -ncld -ncfabs @@ -382,6 +388,7 @@ $(MACAPPEXE) : $(BIN) mkdir -p Grafx2.app Grafx2.app/Contents Grafx2.app/Contents/Frameworks Grafx2.app/Contents/MacOS Grafx2.app/Contents/Resources echo 'APPL????' > Grafx2.app/Contents/PkgInfo cp ../Info.plist Grafx2.app/Contents + cp -r Grafx2.icns Grafx2.app/Contents/Resources cp -r English.lproj Grafx2.app/Contents/Resources cp -r ../share/grafx2/fonts Grafx2.app/Contents/Resources cp -r ../share/grafx2/skins Grafx2.app/Contents/Resources @@ -399,6 +406,8 @@ $(MACAPPEXE) : $(BIN) # rm -fr Grafx2.app/Contents/Frameworks/SDL_ttf.framework/Versions # rm -fr Grafx2.app/Contents/Frameworks/SDL_ttf.framework/Versions cp $(BIN) $(MACAPPEXE) + $(STRIP) -x -X -S $(MACAPPEXE) + chmod +x $(MACAPPEXE) else all : $(BIN) endif diff --git a/src/buttons.c b/src/buttons.c index ee99605b..2d43c572 100644 --- a/src/buttons.c +++ b/src/buttons.c @@ -169,7 +169,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-2010 by",MC_Dark,MC_Light); + Print_in_window(130-4*26,88,"Copyright (c) 2007-2011 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/fileformats.c b/src/fileformats.c index 163e4e45..4f6b1d1b 100644 --- a/src/fileformats.c +++ b/src/fileformats.c @@ -28,6 +28,9 @@ #ifndef __no_pnglib__ #include +#if !defined(PNG_HAVE_PLTE) +#define PNG_HAVE_PLTE 0x02 +#endif #if (PNG_LIBPNG_VER_MAJOR <= 1) && (PNG_LIBPNG_VER_MINOR < 4) // Compatibility layer to allow us to use libng 1.4 or any older one. diff --git a/src/helpfile.h b/src/helpfile.h index 4d95e3ca..e878af88 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-2010, the Grafx2 project team") + HELP_TEXT ("Copyright 2007-2011, the Grafx2 project team") HELP_TEXT (" Copyright 1996-2001, SUNSET DESIGN") }; static const T_Help_table helptable_licence[] =