anthonycicc/warp_rogue
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1 from anthonycicc/mac_compile

Browse source 
Mac compile
This commit is contained in:
Anthony Cicchetti 2018-08-15 13:52:21 -04:00 • committed by GitHub
commit b4aff56671
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/mac.mak
View file

@ -27,7 +27,7 @@ DMG = wrogue-$(GAME_VERSION).dmg
DMG_TMP = $(DMG:.dmg=.tmp.dmg) DMG_TMP = $(DMG:.dmg=.tmp.dmg)
include sources.inc include wrogue_sources.inc
SRC_PLATFORM = \ SRC_PLATFORM = \
platform/sdl/platform_sdl.c \ platform/sdl/platform_sdl.c \
@ -46,14 +46,14 @@ CFLAGS ?= -std=c99 -Wall -Os -fomit-frame-pointer -ffast-math
MFLAGS ?= -Wall -Os -fomit-frame-pointer -ffast-math MFLAGS ?= -Wall -Os -fomit-frame-pointer -ffast-math
CFLAGS += -std=c99 -F"$(SDL_FRAMEWORK_PATH)" \ CFLAGS += -std=c99 -F"$(SDL_FRAMEWORK_PATH)" \
-I"$(SDL_FRAMEWORK_PATH)/SDL.framework/Headers" -I. -I./lib \ -I"$(SDL_FRAMEWORK_PATH)/SDL2.framework/Headers" -I. -I./lib \
-isysroot/Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc -Os -isysroot/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk -Os
MFLAGS += -I"$(SDL_FRAMEWORK_PATH)/SDL.framework/Headers" \ MFLAGS += -I"$(SDL_FRAMEWORK_PATH)/SDL2.framework/Headers" \
-isysroot/Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc -Os -isysroot/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk -Os
LDFLAGS += -F"$(SDL_FRAMEWORK_PATH)" -framework SDL -framework Cocoa \ LDFLAGS += -F"$(SDL_FRAMEWORK_PATH)" -framework SDL2 -framework Cocoa \
-lm -arch i386 -arch ppc -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -lm -Wl,-syslibroot,/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
RM = rm -rf RM = rm -rf
@ -88,9 +88,9 @@ app: $(EXE)
sed '$(INFO_PLIST_PATTERN)' "$(APP_TEMPLATE)/Contents/Info.plist" > "app/$(GAME_NAME).app/Contents/Info.plist" sed '$(INFO_PLIST_PATTERN)' "$(APP_TEMPLATE)/Contents/Info.plist" > "app/$(GAME_NAME).app/Contents/Info.plist"
cp $(EXE) "app/$(GAME_NAME).app/Contents/MacOS/$(EXEC_NAME)" cp $(EXE) "app/$(GAME_NAME).app/Contents/MacOS/$(EXEC_NAME)"
ln -s "Contents/MacOS/$(EXEC_NAME)" "app/$(GAME_NAME).app/$(EXEC_NAME)" ln -s "Contents/MacOS/$(EXEC_NAME)" "app/$(GAME_NAME).app/$(EXEC_NAME)"
cp -R "$(SDL_FRAMEWORK_PATH)/SDL.framework" "app/$(GAME_NAME).app/Contents/Frameworks" cp -R "$(SDL_FRAMEWORK_PATH)/SDL2.framework" "app/$(GAME_NAME).app/Contents/Frameworks"
rm -r "app/$(GAME_NAME).app/Contents/Frameworks/SDL.framework/Versions/A/Headers" rm -r "app/$(GAME_NAME).app/Contents/Frameworks/SDL2.framework/Versions/A/Headers"
rm "app/$(GAME_NAME).app/Contents/Frameworks/SDL.framework/Headers" rm "app/$(GAME_NAME).app/Contents/Frameworks/SDL2.framework/Headers"
cp -R "$(DATA_DIR)/"* "app/$(GAME_NAME).app/Contents/Resources" cp -R "$(DATA_DIR)/"* "app/$(GAME_NAME).app/Contents/Resources"
cp "./platform/mac/$(ICON_NAME)" "app/$(GAME_NAME).app/Contents/Resources/" cp "./platform/mac/$(ICON_NAME)" "app/$(GAME_NAME).app/Contents/Resources/"

2
src/platform/sdl/platform_sdl.c
View file

@ -619,7 +619,7 @@ static void background_init(void)
background_image = SDL_LoadBMP(data_path()); background_image = SDL_LoadBMP(data_path());
if (background_image == NULL) load_bmp_error(); if (background_image == NULL) load_bmp_error();
Background = SDL_DisplayFormat(background_image); Background = SDL_ConvertSurfaceFormat(background_image);
SDL_FreeSurface(background_image); SDL_FreeSurface(background_image);
} }