[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56926] trunk/blender/source/blender/ python: no need to add own define for openmp.
Campbell Barton
ideasman42 at gmail.com
Mon May 20 16:38:43 CEST 2013
Revision: 56926
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56926
Author: campbellbarton
Date: 2013-05-20 14:38:43 +0000 (Mon, 20 May 2013)
Log Message:
-----------
no need to add own define for openmp.
Modified Paths:
--------------
trunk/blender/source/blender/python/SConscript
trunk/blender/source/blender/python/intern/CMakeLists.txt
trunk/blender/source/blender/python/intern/bpy_app_build_options.c
Modified: trunk/blender/source/blender/python/SConscript
===================================================================
--- trunk/blender/source/blender/python/SConscript 2013-05-20 14:00:19 UTC (rev 56925)
+++ trunk/blender/source/blender/python/SConscript 2013-05-20 14:38:43 UTC (rev 56926)
@@ -170,11 +170,7 @@
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']
Modified: trunk/blender/source/blender/python/intern/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/python/intern/CMakeLists.txt 2013-05-20 14:00:19 UTC (rev 56925)
+++ trunk/blender/source/blender/python/intern/CMakeLists.txt 2013-05-20 14:38:43 UTC (rev 56926)
@@ -242,10 +242,5 @@
add_definitions(-DWITH_PLAYER)
endif()
-if(WITH_OPENMP)
- add_definitions(-DWITH_OPENMP)
-endif()
-
-
blender_add_lib(bf_python "${SRC}" "${INC}" "${INC_SYS}")
Modified: trunk/blender/source/blender/python/intern/bpy_app_build_options.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_app_build_options.c 2013-05-20 14:00:19 UTC (rev 56925)
+++ trunk/blender/source/blender/python/intern/bpy_app_build_options.c 2013-05-20 14:38:43 UTC (rev 56926)
@@ -289,7 +289,7 @@
SetObjIncref(Py_False);
#endif
-#ifdef WITH_OPENMP
+#ifdef _OPENMP
SetObjIncref(Py_True);
#else
SetObjIncref(Py_False);
More information about the Bf-blender-cvs
mailing list