Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2014-04-02 02:01:48 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-04-02 02:03:01 +0400
commitdc5fe5d25fbf5e19c06aed1c6b55a8997e30e305 (patch)
tree6a162345f20c66f1fb54ad39902172ca23296f5a /intern/locale/boost_locale_wrapper.cpp
parent7c513f59135006c5a01b94e4590a4b77e8771707 (diff)
Fix bpy.so linking on Mac OS X
D345 from Aleksandr Derbenev
Diffstat (limited to 'intern/locale/boost_locale_wrapper.cpp')
-rw-r--r--intern/locale/boost_locale_wrapper.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/locale/boost_locale_wrapper.cpp b/intern/locale/boost_locale_wrapper.cpp
index c032243505a..25843d60578 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());