[Bf-blender-cvs] [d813f70] input_method_editor: Switch to SDL2 on OSX
Sergey Sharybin
noreply at git.blender.org
Mon Nov 24 00:44:50 CET 2014
Commit: d813f70382f9f0919af8caf55e147a21e9c960ac
Author: Sergey Sharybin
Date: Wed Nov 19 19:41:41 2014 +0100
Branches: input_method_editor
https://developer.blender.org/rBd813f70382f9f0919af8caf55e147a21e9c960ac
Switch to SDL2 on OSX
===================================================================
M CMakeLists.txt
M SConstruct
M build_files/scons/config/darwin-config.py
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 45b0556..dbf2e31 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1938,8 +1938,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 dc60400..05d24c8 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 338065e..96a6352 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
More information about the Bf-blender-cvs
mailing list