forked from bartvdbraak/blender
Fix bpy.so linking on Mac OS X
D345 from Aleksandr Derbenev
This commit is contained in:
parent
7c513f5913
commit
dc5fe5d25f
@ -36,6 +36,14 @@ set(SRC
|
|||||||
boost_locale_wrapper.h
|
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)
|
if(WITH_INTERNATIONAL)
|
||||||
list(APPEND INC_SYS
|
list(APPEND INC_SYS
|
||||||
${BOOST_INCLUDE_DIR}
|
${BOOST_INCLUDE_DIR}
|
||||||
|
@ -64,7 +64,7 @@ void bl_locale_set(const char *locale)
|
|||||||
_locale = gen(locale);
|
_locale = gen(locale);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
#ifdef __APPLE__
|
#if defined(__APPLE__) && !defined(WITH_HEADLESS) && !defined(WITH_GHOST_SDL)
|
||||||
extern char GHOST_user_locale[128]; // pulled from Ghost_SystemCocoa
|
extern char GHOST_user_locale[128]; // pulled from Ghost_SystemCocoa
|
||||||
std::string locale_osx = GHOST_user_locale + std::string(".UTF-8");
|
std::string locale_osx = GHOST_user_locale + std::string(".UTF-8");
|
||||||
_locale = gen(locale_osx.c_str());
|
_locale = gen(locale_osx.c_str());
|
||||||
|
Loading…
Reference in New Issue
Block a user