diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-05-19 04:34:52 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-05-19 04:38:07 +0300 |
| commit | 183b6437744f69bbeadf503f791f763f3c7c4a6f (patch) | |
| tree | 8729ff645a7a4a9924552b9ab14836a4bfcaa590 | |
| parent | 65328fadc3c63c73d5c2e2e977de3dad5bd74219 (diff) | |
Building without Python works again
| -rw-r--r-- | source/blender/blenfont/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | source/blender/blenfont/SConscript | 5 | ||||
| -rw-r--r-- | source/blender/blenfont/intern/blf_translation.c | 4 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/fcurve.c | 2 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_keymap.c | 4 |
5 files changed, 21 insertions, 3 deletions
diff --git a/source/blender/blenfont/CMakeLists.txt b/source/blender/blenfont/CMakeLists.txt index 2f10c3580e0..059e2cac680 100644 --- a/source/blender/blenfont/CMakeLists.txt +++ b/source/blender/blenfont/CMakeLists.txt @@ -29,7 +29,6 @@ set(INC ../gpu ../makesdna ../makesrna - ../python ../imbuf ../../../intern/guardedalloc ../../../intern/glew-mx @@ -67,7 +66,13 @@ if(WITH_INTERNATIONAL) add_definitions(-DWITH_INTERNATIONAL) endif() +if(WITH_PYTHON) + add_definitions(-DWITH_PYTHON) + list(APPEND INC + ../python + ) +endif() + add_definitions(${GL_DEFINITIONS}) blender_add_lib(bf_blenfont "${SRC}" "${INC}" "${INC_SYS}") - diff --git a/source/blender/blenfont/SConscript b/source/blender/blenfont/SConscript index b6cf052a980..61d2ca9b12d 100644 --- a/source/blender/blenfont/SConscript +++ b/source/blender/blenfont/SConscript @@ -44,7 +44,6 @@ incs = [ '../imbuf', '../makesdna', '../makesrna', - '../python', ] incs.extend(Split(env['BF_FREETYPE_INC'])) @@ -57,6 +56,10 @@ if sys.platform == 'win32' or env['OURPLATFORM'] == 'linuxcross': if env['WITH_BF_INTERNATIONAL']: defs.append('WITH_INTERNATIONAL') +if env['WITH_BF_PYTHON']: + defs.append('WITH_PYTHON') + incs.append('../python') + if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'): incs.append(env['BF_PTHREADS_INC']) diff --git a/source/blender/blenfont/intern/blf_translation.c b/source/blender/blenfont/intern/blf_translation.c index 25464864657..5d828d9b7be 100644 --- a/source/blender/blenfont/intern/blf_translation.c +++ b/source/blender/blenfont/intern/blf_translation.c @@ -46,7 +46,9 @@ #include "DNA_userdef_types.h" /* For user settings. */ +#ifdef WITH_PYTHON #include "BPY_extern.h" +#endif #ifdef WITH_INTERNATIONAL @@ -152,9 +154,11 @@ const char *BLF_pgettext(const char *msgctxt, const char *msgid) /* We assume if the returned string is the same (memory level) as the msgid, no translation was found, * and we can try py scripts' ones! */ +#ifdef WITH_PYTHON if (ret == msgid) { ret = BPY_app_translations_py_pgettext(msgctxt, msgid); } +#endif } return ret; diff --git a/source/blender/blenkernel/intern/fcurve.c b/source/blender/blenkernel/intern/fcurve.c index 322da9f1095..6e58513e38e 100644 --- a/source/blender/blenkernel/intern/fcurve.c +++ b/source/blender/blenkernel/intern/fcurve.c @@ -70,7 +70,9 @@ #define SMALL -1.0e-10 #define SELECT 1 +#ifdef WITH_PYTHON static ThreadMutex python_driver_lock = BLI_MUTEX_INITIALIZER; +#endif /* ************************** Data-Level Functions ************************* */ diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c index c765587b7cb..45177903cce 100644 --- a/source/blender/windowmanager/intern/wm_keymap.c +++ b/source/blender/windowmanager/intern/wm_keymap.c @@ -990,11 +990,13 @@ static wmKeyMapItem *wm_keymap_item_find_handlers( "this might not be desired!\n", opname); printf("\tkm: '%s', kmi: '%s'\n", keymap->idname, kmi_str); #ifndef NDEBUG +#ifdef WITH_PYTHON printf("OPERATOR\n"); IDP_spit(properties); printf("KEYMAP\n"); IDP_spit(kmi->ptr->data); #endif +#endif printf("\n"); } @@ -1137,11 +1139,13 @@ static wmKeyMapItem *wm_keymap_item_find( "this might not be desired!\n", opname); printf("\tkm: '%s', kmi: '%s'\n", km->idname, kmi_str); #ifndef NDEBUG +#ifdef WITH_PYTHON printf("OPERATOR\n"); IDP_spit(properties); printf("KEYMAP\n"); IDP_spit(kmi->ptr->data); #endif +#endif printf("\n"); } |