Commit: cade8e25c6a915f1881059e5587cef4233b95f3c
Author: Campbell Barton
Date: Wed May 18 22:05:28 2016 +1000
Branches: master
https://developer.blender.org/rBcade8e25c6a915f1881059e5587cef4233b95f3c
Revert string splitting
Caused error on OSX
===================================================================
M CMakeLists.txt
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6527cf1..5401262 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2144,15 +2144,7 @@ elseif(APPLE)
set(PLATFORM_CFLAGS "-pipe -funsigned-char")
set(PLATFORM_LINKFLAGS
- "-fexceptions -framework CoreServices "
- "-framework Foundation "
- "-framework IOKit "
- "-framework AppKit "
- "-framework Cocoa "
- "-framework Carbon "
- "-framework AudioUnit "
- "-framework AudioToolbox "
- "-framework CoreAudio "
+ "-fexceptions -framework CoreServices -framework Foundation
-framework IOKit -framework AppKit -framework Cocoa -framework Carbon
-framework AudioUnit -framework AudioToolbox -framework CoreAudio"
)
if(WITH_CODEC_QUICKTIME)
set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QTKit")
@@ -2430,8 +2422,7 @@ elseif(APPLE)
endif()
# Get rid of eventually clashes, we export some symbols explicite as
local
set(PLATFORM_LINKFLAGS
- "${PLATFORM_LINKFLAGS} -Xlinker -unexported_symbols_list "
- "-Xlinker ${CMAKE_SOURCE_DIR}/source/creator/osx_locals.map"
+ "${PLATFORM_LINKFLAGS} -Xlinker -unexported_symbols_list
-Xlinker ${CMAKE_SOURCE_DIR}/source/creator/osx_locals.map"
)
if(WITH_CXX11)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
