diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-01-17 06:20:23 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-17 06:20:23 +0400 |
| commit | bbe69705a52386ca5b6552d7187b0492b4b2b378 (patch) | |
| tree | 48fb3e4b70c78b2a31f1c6a0a02e33b09b0113f5 /source/creator | |
| parent | 0e0d88605f0ce7422f278c399b913d394bc7f3ca (diff) | |
| parent | 67b2985cceaf789e1b77d4f70864bf67ee9375c3 (diff) | |
svn merge ^/trunk/blender -r43420:43436
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 19 | ||||
| -rw-r--r-- | source/creator/creator.c | 13 |
2 files changed, 30 insertions, 2 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 581a50a8c39..56612822887 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -178,6 +178,15 @@ if(WITH_PYTHON_MODULE) RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin # only needed on windows ) + if(APPLE) + set_target_properties( + blender + PROPERTIES + LINK_FLAGS_RELEASE "${PLATFORM_LINKFLAGS}" + LINK_FLAGS_DEBUG "${PLATFORM_LINKFLAGS_DEBUG}" + ) + endif() + if(WIN32) # python modules use this set_target_properties( @@ -234,7 +243,11 @@ elseif(WIN32) set(TARGETDIR_VER ${TARGETDIR}/${BLENDER_VERSION}) elseif(APPLE) - set(TARGETDIR_VER ${TARGETDIR}/blender.app/Contents/MacOS/${BLENDER_VERSION}) + if(WITH_PYTHON_MODULE) + set(TARGETDIR_VER ${TARGETDIR}/${BLENDER_VERSION}) + else() + set(TARGETDIR_VER ${TARGETDIR}/blender.app/Contents/MacOS/${BLENDER_VERSION}) + endif() endif() @@ -864,6 +877,10 @@ endif() list(APPEND BLENDER_SORTED_LIBS bf_quicktime) endif() + if(WITH_CARVE) + list(APPEND BLENDER_SORTED_LIBS extern_carve) + endif() + foreach(SORTLIB ${BLENDER_SORTED_LIBS}) set(REMLIB ${SORTLIB}) foreach(SEARCHLIB ${BLENDER_LINK_LIBS}) diff --git a/source/creator/creator.c b/source/creator/creator.c index 1eac930a691..49325f57a9e 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -1138,6 +1138,13 @@ static void setupArguments(bContext *C, bArgs *ba, SYS_SystemHandle *syshandle) /* allow python module to call main */ #define main main_python_enter static void *evil_C= NULL; + +#ifdef __APPLE__ +/* environ is not available in mac shared libraries */ +#include <crt_externs.h> +char **environ = NULL; +#endif + #endif int main(int argc, const char **argv) @@ -1147,6 +1154,10 @@ int main(int argc, const char **argv) bArgs *ba; #ifdef WITH_PYTHON_MODULE +#ifdef __APPLE__ + environ = *_NSGetEnviron(); +#endif + #undef main evil_C= C; #endif @@ -1160,7 +1171,7 @@ int main(int argc, const char **argv) #endif setCallbacks(); -#ifdef __APPLE__ +#if defined(__APPLE__) && !defined(WITH_PYTHON_MODULE) /* patch to ignore argument finder gives us (pid?) */ if (argc==2 && strncmp(argv[1], "-psn_", 5)==0) { extern int GHOST_HACK_getFirstFile(char buf[]); |