diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-05-20 18:38:43 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-05-20 18:38:43 +0400 |
| commit | 0fb5c9117fdb9ad24184a2dad2ad1c8c66565aaa (patch) | |
| tree | 00cd1944b37f2c13d0b9b7ad09b2fc1f97c8adf0 /source/blender/python | |
| parent | 19f11fc7834defd37b1233799776b645035a7f62 (diff) | |
no need to add own define for openmp.
Diffstat (limited to 'source/blender/python')
| -rw-r--r-- | source/blender/python/SConscript | 4 | ||||
| -rw-r--r-- | source/blender/python/intern/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | source/blender/python/intern/bpy_app_build_options.c | 2 |
3 files changed, 1 insertions, 10 deletions
diff --git a/source/blender/python/SConscript b/source/blender/python/SConscript index db5817e6b38..d3905a6f413 100644 --- a/source/blender/python/SConscript +++ b/source/blender/python/SConscript @@ -170,10 +170,6 @@ if env['WITH_BF_OIIO']: if env['WITH_BF_PLAYER']: defs.append('WITH_PLAYER') -if env['WITH_BF_OPENMP']: - defs.append('WITH_OPENMP') - - if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-mingw', 'linuxcross', 'win64-vc'): incs += ' ' + env['BF_PTHREADS_INC'] diff --git a/source/blender/python/intern/CMakeLists.txt b/source/blender/python/intern/CMakeLists.txt index 06a1dc5732b..aae0f926e81 100644 --- a/source/blender/python/intern/CMakeLists.txt +++ b/source/blender/python/intern/CMakeLists.txt @@ -242,10 +242,5 @@ if(WITH_PLAYER) add_definitions(-DWITH_PLAYER) endif() -if(WITH_OPENMP) - add_definitions(-DWITH_OPENMP) -endif() - - blender_add_lib(bf_python "${SRC}" "${INC}" "${INC_SYS}") diff --git a/source/blender/python/intern/bpy_app_build_options.c b/source/blender/python/intern/bpy_app_build_options.c index 87119fa690d..f5dc2942e63 100644 --- a/source/blender/python/intern/bpy_app_build_options.c +++ b/source/blender/python/intern/bpy_app_build_options.c @@ -289,7 +289,7 @@ static PyObject *make_builtopts_info(void) SetObjIncref(Py_False); #endif -#ifdef WITH_OPENMP +#ifdef _OPENMP SetObjIncref(Py_True); #else SetObjIncref(Py_False); |