diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-11-19 21:41:41 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-11-19 21:41:41 +0300 |
| commit | 82d2718c8fe463ef6461544dd69a4f76e835736d (patch) | |
| tree | 703deb1893f9c0c323b8d0d362e0dbb4a941608f | |
| parent | cd54f07a3c71ba146542e41c7b3407b287b52b4c (diff) | |
Switch to SDL2 on OSX
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | SConstruct | 3 | ||||
| -rw-r--r-- | build_files/scons/config/darwin-config.py | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 924684cbfa5..d9f1d96d9c4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1935,8 +1935,9 @@ elseif(APPLE) if(WITH_SDL) set(SDL ${LIBDIR}/sdl) set(SDL_INCLUDE_DIR ${SDL}/include) - set(SDL_LIBRARY SDL) + set(SDL_LIBRARY SDL2) set(SDL_LIBPATH ${SDL}/lib) + set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -lazy_framework ForceFeedback") endif() set(PNG "${LIBDIR}/png") diff --git a/SConstruct b/SConstruct index dc60400eb21..05d24c88431 100644 --- a/SConstruct +++ b/SConstruct @@ -422,6 +422,9 @@ if env['OURPLATFORM']=='darwin': env.Append(LINKFLAGS=['-F/Library/Frameworks','-Xlinker','-weak_framework','-Xlinker','Jackmp']) print B.bc.OKGREEN + "Using Jack" + if env['WITH_BF_SDL']: + env.Append(LINKFLAGS=['-lazy_framework','ForceFeedback']) + if env['WITH_BF_QUICKTIME'] == 1: env['PLATFORM_LINKFLAGS'] = env['PLATFORM_LINKFLAGS']+['-framework','QTKit'] diff --git a/build_files/scons/config/darwin-config.py b/build_files/scons/config/darwin-config.py index 338065e5e88..96a6352fd3a 100644 --- a/build_files/scons/config/darwin-config.py +++ b/build_files/scons/config/darwin-config.py @@ -68,7 +68,7 @@ BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib ${BF_FFMPEG}/lib' #ogg libs are stored i WITH_BF_SDL = True BF_SDL = LIBDIR + '/sdl' #$(shell sdl-config --prefix) BF_SDL_INC = '${BF_SDL}/include' #$(shell $(BF_SDL)/bin/sdl-config --cflags) -BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer +BF_SDL_LIB = 'SDL2' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer BF_SDL_LIBPATH = '${BF_SDL}/lib' WITH_BF_OPENEXR = True |