diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2016-04-28 18:33:19 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2016-04-28 18:33:19 +0300 |
| commit | 1f723603c882e6d79ab69bea6e5c034ae21a6ce7 (patch) | |
| tree | 098b0133beea06c460c3e9e92010bc669d151e5d /source/creator | |
| parent | 3632c4997f5019d2a519996d9e216d474aa05d3b (diff) | |
| parent | a48d7407986d04492107a2ef16d0ff6f0d012c45 (diff) | |
Merge branch 'master' into temp_remove_particlestemp_remove_particles
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | source/creator/creator.c | 2 | ||||
| -rw-r--r-- | source/creator/creator_args.c | 2 | ||||
| -rw-r--r-- | source/creator/creator_signals.c | 2 |
4 files changed, 12 insertions, 3 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 273e5b33d0d..b7d8381639d 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -996,6 +996,15 @@ elseif(APPLE) DESTINATION ${TARGETDIR_VER}/python USE_SOURCE_PERMISSIONS ) + + # Needed for distutils/pip + # get the last part of the include dir, will be 'python{version}{abiflag}', + get_filename_component(_py_inc_suffix ${PYTHON_INCLUDE_DIR} NAME) + install( + FILES ${PYTHON_INCLUDE_DIR}/pyconfig.h + DESTINATION ${TARGETDIR_VER}/python/include/${_py_inc_suffix} + ) + unset(_py_inc_suffix) endif() # install blenderplayer bundle - copy of blender.app above. re-using macros et al diff --git a/source/creator/creator.c b/source/creator/creator.c index 98e3a5c881c..d253cbad177 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -317,7 +317,7 @@ int main( BLI_threadapi_init(); - initglobals(); /* blender.c */ + BKE_blender_globals_init(); /* blender.c */ IMB_init(); BKE_images_init(); diff --git a/source/creator/creator_args.c b/source/creator/creator_args.c index c2ded1f2b09..69765fc2341 100644 --- a/source/creator/creator_args.c +++ b/source/creator/creator_args.c @@ -44,7 +44,7 @@ #include "BLI_fileops.h" #include "BLI_mempool.h" -#include "BKE_blender.h" +#include "BKE_blender_version.h" #include "BKE_context.h" #include "BKE_global.h" diff --git a/source/creator/creator_signals.c b/source/creator/creator_signals.c index b25d7c56f6e..80aba762cfc 100644 --- a/source/creator/creator_signals.c +++ b/source/creator/creator_signals.c @@ -59,7 +59,7 @@ #include BLI_SYSTEM_PID_H #include "BKE_appdir.h" /* BKE_tempdir_base */ -#include "BKE_blender.h" +#include "BKE_blender_version.h" #include "BKE_global.h" #include "BKE_main.h" #include "BKE_report.h" |