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

Assume OS X uses SDL2.framework for SDL2.

parent 8b3c468e
No related branches found
No related tags found
No related merge requests found
...@@ -72,7 +72,7 @@ ifdef USE_SDL ...@@ -72,7 +72,7 @@ ifdef USE_SDL
endif endif
else else
ifeq ($(os),darwin) ifeq ($(os),darwin)
ifeq ($(shell if [ -d /Library/Frameworks/SDL.framework ] ; then echo YES ; fi),YES) ifeq ($(shell if [ -d /Library/Frameworks/SDL2.framework ] ; then echo YES ; fi),YES)
SDL_FRAMEWORK_PATH ?= /Library/Frameworks SDL_FRAMEWORK_PATH ?= /Library/Frameworks
endif endif
ifdef SDL_FRAMEWORK_PATH ifdef SDL_FRAMEWORK_PATH
...@@ -131,11 +131,11 @@ ifdef WITH_SDL ...@@ -131,11 +131,11 @@ ifdef WITH_SDL
CIOLIB-MT_CFLAGS += -DWITH_SDL -DSTATIC_SDL CIOLIB-MT_CFLAGS += -DWITH_SDL -DSTATIC_SDL
WITH_SDL := 1 WITH_SDL := 1
STATIC_SDL := 1 STATIC_SDL := 1
CIOLIB-MT_CFLAGS += -I${SDL_FRAMEWORK_PATH}/SDL.framework/Headers CIOLIB-MT_CFLAGS += -I${SDL_FRAMEWORK_PATH}/SDL2.framework/Headers
CIOLIB-MT_LIBS += -F${SDL_FRAMEWORK_PATH} -framework SDL -framework Cocoa -framework Carbon -I${SDL_FRAMEWORK_PATH}/SDL.framework/Headers CIOLIB-MT_LIBS += -F${SDL_FRAMEWORK_PATH} -framework SDL2 -framework Cocoa -framework Carbon -I${SDL_FRAMEWORK_PATH}/SDL2.framework/Headers
CIOLIB_CFLAGS += -DWITH_SDL -DSTATIC_SDL CIOLIB_CFLAGS += -DWITH_SDL -DSTATIC_SDL
CIOLIB_CFLAGS += -I${SDL_FRAMEWORK_PATH}/SDL.framework/Headers CIOLIB_CFLAGS += -I${SDL_FRAMEWORK_PATH}/SDL2.framework/Headers
CIOLIB_LIBS += -F${SDL_FRAMEWORK_PATH} -framework SDL -framework Cocoa -framework Carbon -I${SDL_FRAMEWORK_PATH}/SDL.framework/Headers CIOLIB_LIBS += -F${SDL_FRAMEWORK_PATH} -framework SDL2 -framework Cocoa -framework Carbon -I${SDL_FRAMEWORK_PATH}/SDL2.framework/Headers
else else
ifeq ($(os),win32) ifeq ($(os),win32)
CIOLIB-MT_CFLAGS += -DWITH_SDL CIOLIB-MT_CFLAGS += -DWITH_SDL
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment