diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-04-02 02:01:48 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-04-02 02:03:01 +0400 |
| commit | dc5fe5d25fbf5e19c06aed1c6b55a8997e30e305 (patch) | |
| tree | 6a162345f20c66f1fb54ad39902172ca23296f5a /intern/locale | |
| parent | 7c513f59135006c5a01b94e4590a4b77e8771707 (diff) | |
Fix bpy.so linking on Mac OS X
D345 from Aleksandr Derbenev
Diffstat (limited to 'intern/locale')
| -rw-r--r-- | intern/locale/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | intern/locale/boost_locale_wrapper.cpp | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/intern/locale/CMakeLists.txt b/intern/locale/CMakeLists.txt index 4dc447391fc..217fe9a8c71 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 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()); |