[Bf-blender-cvs] [dc5fe5d] master: Fix bpy.so linking on Mac OS X

[Campbell Barton]

Commit: dc5fe5d25fbf5e19c06aed1c6b55a8997e30e305
Author: Campbell Barton
Date:   Wed Apr 2 09:01:48 2014 +1100
https://developer.blender.org/rBdc5fe5d25fbf5e19c06aed1c6b55a8997e30e305

Fix bpy.so linking on Mac OS X

D345 from Aleksandr Derbenev

===================================================================

M	intern/locale/CMakeLists.txt
M	intern/locale/boost_locale_wrapper.cpp

===================================================================

diff --git a/intern/locale/CMakeLists.txt b/intern/locale/CMakeLists.txt
index 4dc4473..217fe9a 100644
--- a/intern/locale/CMakeLists.txt
+++ b/intern/locale/CMakeLists.txt
@@ -36,6 +36,14 @@ set(SRC
 	boost_locale_wrapper.h
 )
 
+if(WITH_HEADLESS)
+	add_definitions(-DWITH_HEADLESS)
+endif()
+
+if(WITH_GHOST_SDL)
+	add_definitions(-DWITH_GHOST_SDL)
+endif()
+
 if(WITH_INTERNATIONAL)
 	list(APPEND INC_SYS
 		${BOOST_INCLUDE_DIR}
diff --git a/intern/locale/boost_locale_wrapper.cpp b/intern/locale/boost_locale_wrapper.cpp
index c032243..25843d6 100644
--- a/intern/locale/boost_locale_wrapper.cpp
+++ b/intern/locale/boost_locale_wrapper.cpp
@@ -64,7 +64,7 @@ void bl_locale_set(const char *locale)
 			_locale = gen(locale);
 		}
 		else {
-#ifdef __APPLE__
+#if defined(__APPLE__) && !defined(WITH_HEADLESS) && !defined(WITH_GHOST_SDL)
 			extern char GHOST_user_locale[128]; // pulled from Ghost_SystemCocoa
 			std::string locale_osx = GHOST_user_locale + std::string(".UTF-8");
 			_locale = gen(locale_osx.c_str());