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

new OSX version should be ready

Browse Source 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1753 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Franck Charlet 2011-03-10 23:38:38 +00:00
parent 431484914e
commit a5fc3d9fec
3 changed files with 5 additions and 4 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.

7
src/Makefile
View File

@ -33,9 +33,10 @@
STRIP = strip STRIP = strip
### Specific to build MAC OS X universal binaries on Tiger ### ### Specific to build MAC OS X universal binaries on Tiger ###
### (may need to be changed on your OS) ### ### (may need to be changed or removed depedning on the OSX version) ###
MACOSX_SYSROOT = /Developer/SDKs/MacOSX10.4u.sdk MACOSX_SYSROOT = /Developer/SDKs/MacOSX10.4u.sdk
MACOSX_ARCH = -arch ppc -arch i386
### PLATFORM DETECTION AND CONFIGURATION ### ### PLATFORM DETECTION AND CONFIGURATION ###
@ -95,9 +96,9 @@ else
# Where the SDL frameworks are located # Where the SDL frameworks are located
FWDIR = /Library/Frameworks FWDIR = /Library/Frameworks
BIN = ../bin/grafx2 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 SDLCOPT = $(MACOSX_ARCH) -I$(FWDIR)/SDL.framework/Headers -I$(FWDIR)/SDL_image.framework/Headers -I$(FWDIR)/SDL_ttf.framework/Headers -D_THREAD_SAFE
#-framework SDL_ttf #-framework SDL_ttf
SDLLOPT = -isysroot $(MACOSX_SYSROOT) -arch ppc -arch i386 -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
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 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 -lz LOPT = $(SDLLOPT) -lpng -lz
# 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.

2
src/SDLMain.m
View File

@ -82,7 +82,7 @@ static NSString *getApplicationName(void)
if (NSKeyDown == [anEvent type] || NSKeyUp == [anEvent type]) { if (NSKeyDown == [anEvent type] || NSKeyUp == [anEvent type]) {
if ([anEvent modifierFlags] & NSCommandKeyMask) if ([anEvent modifierFlags] & NSCommandKeyMask)
{ {
SDL_SetModState(SDL_GetModState() | KMOD_META); // SDL_SetModState(SDL_GetModState() /*| KMOD_META*/);
[super sendEvent: anEvent]; [super sendEvent: anEvent];
} }
} else } else