Skip to content
Snippets Groups Projects
Commit e34537a7 authored by deuce's avatar deuce
Browse files

Allow passing SDL_FRAMEWORK_PATH on the make commandline.

parent 992359c8
No related branches found
No related tags found
No related merge requests found
......@@ -58,8 +58,11 @@ ifdef USE_SDL
else
ifeq ($(os),darwin)
ifeq ($(shell if [ -d /Library/Frameworks/SDL.framework ] ; then echo YES ; fi),YES)
WITH_SDL := 1
SDL_FRAMEWORK_PATH ?= /Library/Frameworks
endif
ifdef SDL_FRAMEWORK_PATH
WITH_SDL := 1
endif
else
ifeq ($(shell sdl-config --cflags > /dev/null 2>&1 && echo YES),YES)
SDL_CONFIG := sdl-config
......@@ -122,11 +125,11 @@ ifdef WITH_SDL
CIOLIB-MT_CFLAGS += -DWITH_SDL -DSTATIC_SDL
WITH_SDL := 1
STATIC_SDL := 1
CIOLIB-MT_CFLAGS += -I/Library/Frameworks/SDL.framework/Headers
CIOLIB-MT_LIBS += -framework SDL -framework Cocoa -framework Carbon -I/Library/Frameworks/SDL.framework/Headers
CIOLIB-MT_CFLAGS += -I${SDL_FRAMEWORK_PATH}/SDL.framework/Headers
CIOLIB-MT_LIBS += -F${SDL_FRAMEWORK_PATH} -framework SDL -framework Cocoa -framework Carbon -I${SDL_FRAMEWORK_PATH}/SDL.framework/Headers
CIOLIB_CFLAGS += -DWITH_SDL -DSTATIC_SDL
CIOLIB_CFLAGS += -I/Library/Frameworks/SDL.framework/Headers
CIOLIB_LIBS += -framework SDL -framework Cocoa -framework Carbon -I/Library/Frameworks/SDL.framework/Headers
CIOLIB_CFLAGS += -I${SDL_FRAMEWORK_PATH}/SDL.framework/Headers
CIOLIB_LIBS += -F${SDL_FRAMEWORK_PATH} -framework SDL -framework Cocoa -framework Carbon -I${SDL_FRAMEWORK_PATH}/SDL.framework/Headers
endif
endif
endif
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment