sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix bpy.so linking on Mac OS X

Browse Source 
D345 from Aleksandr Derbenev
This commit is contained in:
Campbell Barton 2014-04-02 09:01:48 +11:00
parent 7c513f5913
commit dc5fe5d25f
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
intern/locale/CMakeLists.txt
View File

@ -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}

2
intern/locale/boost_locale_wrapper.cpp
View File

@ -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());