m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed makefile for macosx again

Browse Source 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1905 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Franck Charlet 2012-02-20 19:56:52 +00:00
parent b92d66911f
commit 8ea1ab7fc8
5 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/.DS_Store vendored
View File

Binary file not shown.

30
src/Makefile
View File

@ -1,6 +1,6 @@
# Grafx2 - The Ultimate 256-color bitmap paint program # Grafx2 - The Ultimate 256-color bitmap paint program
# #
# Copyright 2011 Franck Charlet # Copyright 2012 Franck Charlet
# Copyright 2011 Pawel Góralski # Copyright 2011 Pawel Góralski
# Copyright 2009 Per Olofsson # Copyright 2009 Per Olofsson
# Copyright 2008 Peter Gordon # Copyright 2008 Peter Gordon
@ -32,11 +32,18 @@
# Compile with OPTIM=0 to disable gcc optimizations, to enable debug. # Compile with OPTIM=0 to disable gcc optimizations, to enable debug.
STRIP = strip STRIP = strip
### Specific to build MAC OS X universal binaries on Lion ### ### Specific to build MAC OS X universal binaries on Tiger or Lion ###
### (may need to be changed or removed depedning on the OSX version) ### ### (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_SYSROOT = /Developer/SDKs/MacOSX10.6.sdk
MACOSX_ARCH = -arch x86_64 -arch i386 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 ### ### 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 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 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 LUACOPT = -I$(FWDIR)/Lua.framework/Headers
ifdef MACOSX_LION
LUALOPT = -framework lua LUALOPT = -framework lua
else
LUALOPT = -llua
endif
# these are for everyone # 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 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 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. # Use gcc for compiling. Use ncc to build a callgraph and analyze the code.
CC = gcc CC = gcc
#CC = nccgen -ncgcc -ncld -ncfabs #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/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/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 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/Lua.framework/Versions
mkdir -p Grafx2.app/Contents/Frameworks/libpng14.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.framework/Versions
mkdir -p Grafx2.app/Contents/Frameworks/SDL_image.framework/Versions mkdir -p Grafx2.app/Contents/Frameworks/SDL_image.framework/Versions
# mkdir -p Grafx2.app/Contents/Frameworks/SDL_ttf.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)/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 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.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_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 # 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.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/Headers
rm -fr Grafx2.app/Contents/Frameworks/SDL_image.framework/Versions/A/Resources 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/Resources
rm -fr Grafx2.app/Contents/Frameworks/Lua.framework/Versions/A/Headers 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/Resources
rm -fr Grafx2.app/Contents/Frameworks/libpng14.framework/Versions/1.4.8/Headers 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) cp $(BIN) $(MACAPPEXE)
$(STRIP) -x -X -S $(MACAPPEXE) $(STRIP) -x -X -S $(MACAPPEXE)
chmod +x $(MACAPPEXE) chmod +x $(MACAPPEXE)

2
src/buttons.c
View File

@ -163,7 +163,7 @@ void Button_Message_initial(void)
for (x=14,x_pos=0; x_pos<231; x_pos++,x++) for (x=14,x_pos=0; x_pos<231; x_pos++,x++)
Pixel_in_window(x,y,Gfx->Logo_grafx2[offs_y+x_pos]); 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*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*26,112,"Copyright (c) 1996-2001 by",MC_Dark,MC_Light);
Print_in_window(130-4*13,120,"Sunset Design",MC_Black,MC_Light); Print_in_window(130-4*13,120,"Sunset Design",MC_Black,MC_Light);

2
src/helpfile.h
View File

@ -67,7 +67,7 @@ static const T_Help_table helptable_about[] =
#else #else
HELP_TEXT ("") HELP_TEXT ("")
#endif #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") HELP_TEXT (" Copyright 1996-2001, SUNSET DESIGN")
}; };
static const T_Help_table helptable_licence[] = static const T_Help_table helptable_licence[] =

1
src/text.c
View File

@ -45,7 +45,6 @@
#endif #endif
#if defined(__macosx__) #if defined(__macosx__)
#include <Carbon/Carbon.h>
#import <corefoundation/corefoundation.h> #import <corefoundation/corefoundation.h>
#import <sys/param.h> #import <sys/param.h>
#endif #endif