rename and negate DISABLE_PYTHON --> WITH_PYTHON
authorCampbell Barton <ideasman42@gmail.com>
Sun, 31 Oct 2010 04:11:39 +0000 (04:11 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 31 Oct 2010 04:11:39 +0000 (04:11 +0000)
217 files changed:
build_files/make/nan_compile.mk
intern/audaspace/CMakeLists.txt
intern/audaspace/SConscript
intern/audaspace/intern/AUD_C-API.cpp
intern/audaspace/intern/AUD_PyInit.h
release/scripts/ui/space_text.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/context.c
source/blender/blenkernel/intern/exotic.c
source/blender/blenkernel/intern/fcurve.c
source/blender/blenkernel/intern/fmodifier.c
source/blender/blenkernel/intern/node.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/script.c
source/blender/blenkernel/intern/text.c
source/blender/editors/interface/CMakeLists.txt
source/blender/editors/interface/SConscript
source/blender/editors/interface/interface.c
source/blender/editors/mesh/editface.c
source/blender/editors/object/CMakeLists.txt
source/blender/editors/object/SConscript
source/blender/editors/object/object_constraint.c
source/blender/editors/space_console/CMakeLists.txt
source/blender/editors/space_console/SConscript
source/blender/editors/space_console/space_console.c
source/blender/editors/space_script/CMakeLists.txt
source/blender/editors/space_script/SConscript
source/blender/editors/space_script/script_edit.c
source/blender/editors/space_script/space_script.c
source/blender/editors/space_text/CMakeLists.txt
source/blender/editors/space_text/SConscript
source/blender/editors/space_text/text_header.c
source/blender/editors/space_text/text_ops.c
source/blender/editors/space_text/text_python.c
source/blender/editors/util/undo.c
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/SConscript
source/blender/makesrna/intern/rna_wm.c
source/blender/nodes/CMakeLists.txt
source/blender/nodes/SConscript
source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c
source/blender/windowmanager/CMakeLists.txt
source/blender/windowmanager/SConscript
source/blender/windowmanager/intern/wm.c
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_init_exit.c
source/creator/CMakeLists.txt
source/creator/SConscript
source/creator/creator.c
source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
source/gameengine/BlenderRoutines/CMakeLists.txt
source/gameengine/BlenderRoutines/SConscript
source/gameengine/Converter/BL_ActionActuator.cpp
source/gameengine/Converter/BL_ActionActuator.h
source/gameengine/Converter/BL_ArmatureActuator.cpp
source/gameengine/Converter/BL_ArmatureActuator.h
source/gameengine/Converter/BL_ArmatureChannel.cpp
source/gameengine/Converter/BL_ArmatureChannel.h
source/gameengine/Converter/BL_ArmatureConstraint.cpp
source/gameengine/Converter/BL_ArmatureConstraint.h
source/gameengine/Converter/BL_ArmatureObject.cpp
source/gameengine/Converter/BL_ArmatureObject.h
source/gameengine/Converter/BL_ShapeActionActuator.cpp
source/gameengine/Converter/BL_ShapeActionActuator.h
source/gameengine/Converter/CMakeLists.txt
source/gameengine/Converter/KX_BlenderSceneConverter.cpp
source/gameengine/Converter/KX_BlenderSceneConverter.h
source/gameengine/Converter/KX_ConvertControllers.cpp
source/gameengine/Converter/KX_ConvertProperties.cpp
source/gameengine/Converter/SConscript
source/gameengine/Expressions/BoolValue.cpp
source/gameengine/Expressions/BoolValue.h
source/gameengine/Expressions/CMakeLists.txt
source/gameengine/Expressions/FloatValue.cpp
source/gameengine/Expressions/FloatValue.h
source/gameengine/Expressions/IntValue.cpp
source/gameengine/Expressions/IntValue.h
source/gameengine/Expressions/KX_Python.h
source/gameengine/Expressions/ListValue.cpp
source/gameengine/Expressions/ListValue.h
source/gameengine/Expressions/PyObjectPlus.cpp
source/gameengine/Expressions/PyObjectPlus.h
source/gameengine/Expressions/SConscript
source/gameengine/Expressions/StringValue.h
source/gameengine/Expressions/Value.cpp
source/gameengine/Expressions/Value.h
source/gameengine/GameLogic/CMakeLists.txt
source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
source/gameengine/GameLogic/SCA_ANDController.cpp
source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
source/gameengine/GameLogic/SCA_ActuatorSensor.h
source/gameengine/GameLogic/SCA_AlwaysSensor.cpp
source/gameengine/GameLogic/SCA_DelaySensor.cpp
source/gameengine/GameLogic/SCA_IController.cpp
source/gameengine/GameLogic/SCA_IController.h
source/gameengine/GameLogic/SCA_ILogicBrick.cpp
source/gameengine/GameLogic/SCA_ILogicBrick.h
source/gameengine/GameLogic/SCA_IObject.cpp
source/gameengine/GameLogic/SCA_IObject.h
source/gameengine/GameLogic/SCA_ISensor.cpp
source/gameengine/GameLogic/SCA_ISensor.h
source/gameengine/GameLogic/SCA_JoystickSensor.cpp
source/gameengine/GameLogic/SCA_JoystickSensor.h
source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
source/gameengine/GameLogic/SCA_KeyboardSensor.h
source/gameengine/GameLogic/SCA_LogicManager.cpp
source/gameengine/GameLogic/SCA_MouseSensor.cpp
source/gameengine/GameLogic/SCA_MouseSensor.h
source/gameengine/GameLogic/SCA_NANDController.cpp
source/gameengine/GameLogic/SCA_NORController.cpp
source/gameengine/GameLogic/SCA_ORController.cpp
source/gameengine/GameLogic/SCA_PropertyActuator.cpp
source/gameengine/GameLogic/SCA_PropertySensor.cpp
source/gameengine/GameLogic/SCA_PropertySensor.h
source/gameengine/GameLogic/SCA_PythonController.cpp
source/gameengine/GameLogic/SCA_PythonController.h
source/gameengine/GameLogic/SCA_PythonKeyboard.cpp
source/gameengine/GameLogic/SCA_PythonKeyboard.h
source/gameengine/GameLogic/SCA_PythonMouse.cpp
source/gameengine/GameLogic/SCA_PythonMouse.h
source/gameengine/GameLogic/SCA_RandomActuator.cpp
source/gameengine/GameLogic/SCA_RandomActuator.h
source/gameengine/GameLogic/SCA_RandomSensor.cpp
source/gameengine/GameLogic/SCA_RandomSensor.h
source/gameengine/GameLogic/SCA_XNORController.cpp
source/gameengine/GameLogic/SCA_XORController.cpp
source/gameengine/GameLogic/SConscript
source/gameengine/GamePlayer/common/SConscript
source/gameengine/GamePlayer/ghost/GPG_Application.cpp
source/gameengine/GamePlayer/ghost/SConscript
source/gameengine/Ketsji/BL_Shader.cpp
source/gameengine/Ketsji/BL_Shader.h
source/gameengine/Ketsji/CMakeLists.txt
source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
source/gameengine/Ketsji/KXNetwork/SConscript
source/gameengine/Ketsji/KX_ArmatureSensor.cpp
source/gameengine/Ketsji/KX_ArmatureSensor.h
source/gameengine/Ketsji/KX_BlenderMaterial.cpp
source/gameengine/Ketsji/KX_BlenderMaterial.h
source/gameengine/Ketsji/KX_Camera.cpp
source/gameengine/Ketsji/KX_Camera.h
source/gameengine/Ketsji/KX_CameraActuator.cpp
source/gameengine/Ketsji/KX_CameraActuator.h
source/gameengine/Ketsji/KX_ConstraintActuator.cpp
source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
source/gameengine/Ketsji/KX_ConstraintWrapper.h
source/gameengine/Ketsji/KX_Dome.cpp
source/gameengine/Ketsji/KX_GameActuator.cpp
source/gameengine/Ketsji/KX_GameObject.cpp
source/gameengine/Ketsji/KX_GameObject.h
source/gameengine/Ketsji/KX_IpoActuator.cpp
source/gameengine/Ketsji/KX_KetsjiEngine.cpp
source/gameengine/Ketsji/KX_KetsjiEngine.h
source/gameengine/Ketsji/KX_Light.cpp
source/gameengine/Ketsji/KX_Light.h
source/gameengine/Ketsji/KX_MeshProxy.cpp
source/gameengine/Ketsji/KX_MeshProxy.h
source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
source/gameengine/Ketsji/KX_MouseFocusSensor.h
source/gameengine/Ketsji/KX_NearSensor.cpp
source/gameengine/Ketsji/KX_NearSensor.h
source/gameengine/Ketsji/KX_ObjectActuator.cpp
source/gameengine/Ketsji/KX_ObjectActuator.h
source/gameengine/Ketsji/KX_ParentActuator.cpp
source/gameengine/Ketsji/KX_ParentActuator.h
source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h
source/gameengine/Ketsji/KX_PolyProxy.cpp
source/gameengine/Ketsji/KX_PolyProxy.h
source/gameengine/Ketsji/KX_PolygonMaterial.cpp
source/gameengine/Ketsji/KX_PolygonMaterial.h
source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
source/gameengine/Ketsji/KX_PyConstraintBinding.h
source/gameengine/Ketsji/KX_PyMath.cpp
source/gameengine/Ketsji/KX_PyMath.h
source/gameengine/Ketsji/KX_PythonInit.cpp
source/gameengine/Ketsji/KX_PythonInit.h
source/gameengine/Ketsji/KX_PythonInitTypes.cpp
source/gameengine/Ketsji/KX_PythonInitTypes.h
source/gameengine/Ketsji/KX_PythonSeq.cpp
source/gameengine/Ketsji/KX_PythonSeq.h
source/gameengine/Ketsji/KX_RadarSensor.cpp
source/gameengine/Ketsji/KX_RaySensor.cpp
source/gameengine/Ketsji/KX_RaySensor.h
source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
source/gameengine/Ketsji/KX_SCA_EndObjectActuator.cpp
source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
source/gameengine/Ketsji/KX_Scene.cpp
source/gameengine/Ketsji/KX_Scene.h
source/gameengine/Ketsji/KX_SceneActuator.cpp
source/gameengine/Ketsji/KX_SceneActuator.h
source/gameengine/Ketsji/KX_SoundActuator.cpp
source/gameengine/Ketsji/KX_SoundActuator.h
source/gameengine/Ketsji/KX_StateActuator.cpp
source/gameengine/Ketsji/KX_TouchSensor.cpp
source/gameengine/Ketsji/KX_TouchSensor.h
source/gameengine/Ketsji/KX_TrackToActuator.cpp
source/gameengine/Ketsji/KX_TrackToActuator.h
source/gameengine/Ketsji/KX_VehicleWrapper.cpp
source/gameengine/Ketsji/KX_VehicleWrapper.h
source/gameengine/Ketsji/KX_VertexProxy.cpp
source/gameengine/Ketsji/KX_VertexProxy.h
source/gameengine/Ketsji/KX_VisibilityActuator.cpp
source/gameengine/Ketsji/SConscript
source/gameengine/Physics/Bullet/SConscript
source/gameengine/Rasterizer/SConscript
source/gameengine/VideoTexture/CMakeLists.txt
source/gameengine/VideoTexture/SConscript

index a6d157d..2931adb 100644 (file)
@@ -35,6 +35,8 @@ include nan_definitions.mk
 CPPFLAGS ?= $(NAN_CPPFLAGS)
 
 # common parts ---------------------------------------------------
+CFLAGS += -DWITH_PYTHON
+CCFLAGS += -DWITH_PYTHON
 
 # Uncomment next lines to enable integrated game engine
 ifneq ($(NAN_NO_KETSJI), true)
index 2dd4694..be39a73 100644 (file)
@@ -178,8 +178,7 @@ IF(WITH_PYTHON)
        SET(PYTHONSRC
                Python/AUD_PyAPI.cpp
        )
-ELSE(WITH_PYTHON)
-       ADD_DEFINITIONS(-DDISABLE_PYTHON)
+       ADD_DEFINITIONS(-DWITH_PYTHON)
 ENDIF(WITH_PYTHON)
 
 SET(SRC ${SRC} ${FFMPEGSRC} ${SNDFILESRC} ${FFTW3SRC} ${SDLSRC} ${OPENALSRC} ${JACKSRC} ${PYTHONSRC})
index 7230bff..2c86849 100644 (file)
@@ -39,8 +39,7 @@ if env['WITH_BF_SNDFILE']:
 if env['WITH_BF_PYTHON']:
     sources += env.Glob('Python/*.cpp')
     incs += ' Python ' + env['BF_PYTHON_INC']
-else:
-    defs.append('DISABLE_PYTHON')
+    defs.append('WITH_PYTHON')
 
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
     incs += ' ' + env['BF_PTHREADS_INC']
index 38732fc..1dd0ab1 100644 (file)
@@ -28,7 +28,7 @@
 #define __STDC_CONSTANT_MACROS
 #endif
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 #include "AUD_PyInit.h"
 #include "AUD_PyAPI.h"
 
@@ -141,7 +141,7 @@ int AUD_init(AUD_DeviceType device, AUD_DeviceSpecs specs, int buffersize)
                AUD_device = dev;
                AUD_3ddevice = dynamic_cast<AUD_I3DDevice*>(AUD_device);
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
                if(g_pyinitialized)
                {
                        g_device = (Device*)Device_empty();
@@ -162,7 +162,7 @@ int AUD_init(AUD_DeviceType device, AUD_DeviceSpecs specs, int buffersize)
 
 void AUD_exit()
 {
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        if(g_device)
        {
                Py_XDECREF(g_device);
@@ -176,7 +176,7 @@ void AUD_exit()
        AUD_3ddevice = NULL;
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 static PyObject* AUD_getCDevice(PyObject* self)
 {
        if(g_device)
index bd67259..0b80b3a 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef AUD_PYINIT
 #define AUD_PYINIT
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 #include "Python.h"
 
 #ifdef __cplusplus
index 163fa07..58f12ba 100644 (file)
@@ -174,7 +174,7 @@ class TEXT_MT_text(bpy.types.Menu):
             layout.column()
             layout.operator("text.run_script")
 
-            #ifndef DISABLE_PYTHON
+            #ifdef WITH_PYTHON
             # XXX if(BPY_is_pyconstraint(text))
             # XXX   uiMenuItemO(head, 0, "text.refresh_pyconstraints");
             #endif
index 5252003..eb56472 100644 (file)
@@ -188,8 +188,7 @@ ENDIF(WITH_LCMS)
 
 IF(WITH_PYTHON)
        LIST(APPEND INC ../python ${PYTHON_INC})
-ELSE(WITH_PYTHON)
-       ADD_DEFINITIONS(-DDISABLE_PYTHON)
+       ADD_DEFINITIONS(-DWITH_PYTHON)
 ENDIF(WITH_PYTHON)
 
 IF(WITH_OPENMP)
index e8919a1..517c4ce 100644 (file)
@@ -19,11 +19,10 @@ incs += ' ' + env['BF_ZLIB_INC']
 
 defs = [ 'GLEW_STATIC' ]
 
-if not env['WITH_BF_PYTHON']:
-    defs.append('DISABLE_PYTHON')
-else:
+if env['WITH_BF_PYTHON']:
     incs += ' ../python'
     incs += ' ' + env['BF_PYTHON_INC']
+    defs.append('WITH_PYTHON')
     if env['BF_DEBUG']:
         defs.append('DEBUG')
 
index 1892f6f..5f38750 100644 (file)
@@ -70,7 +70,7 @@
 #include "BKE_shrinkwrap.h"
 #include "BKE_mesh.h"
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 #include "BPY_extern.h"
 #endif
 
@@ -1983,7 +1983,7 @@ static void pycon_id_looper (bConstraint *con, ConstraintIDFunc func, void *user
 /* Whether this approach is maintained remains to be seen (aligorith) */
 static void pycon_get_tarmat (bConstraint *con, bConstraintOb *cob, bConstraintTarget *ct, float UNUSED(ctime))
 {
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        bPythonConstraint *data= con->data;
 #endif
 
@@ -2003,7 +2003,7 @@ static void pycon_get_tarmat (bConstraint *con, bConstraintOb *cob, bConstraintT
                constraint_target_to_mat4(cob->scene, ct->tar, ct->subtarget, ct->matrix, CONSTRAINT_SPACE_WORLD, ct->space, con->headtail);
                
                /* only execute target calculation if allowed */
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
                if (G.f & G_SCRIPT_AUTOEXEC)
                        BPY_pyconstraint_target(data, ct);
 #endif
@@ -2014,7 +2014,7 @@ static void pycon_get_tarmat (bConstraint *con, bConstraintOb *cob, bConstraintT
 
 static void pycon_evaluate (bConstraint *con, bConstraintOb *cob, ListBase *targets)
 {
-#ifdef DISABLE_PYTHON
+#ifndef WITH_PYTHON
        (void)con; (void)cob; (void)targets; /* unused */
        return;
 #else
@@ -2034,7 +2034,7 @@ static void pycon_evaluate (bConstraint *con, bConstraintOb *cob, ListBase *targ
        
        /* Now, run the actual 'constraint' function, which should only access the matrices */
        BPY_pyconstraint_eval(data, cob, targets);
-#endif /* DISABLE_PYTHON */
+#endif /* WITH_PYTHON */
 }
 
 static bConstraintTypeInfo CTI_PYTHON = {
index a5d96ba..e1a7ef7 100644 (file)
@@ -46,7 +46,7 @@
 #include "BKE_main.h"
 #include "BKE_screen.h"
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 #include "BPY_extern.h"
 #endif
 
@@ -425,7 +425,7 @@ static int ctx_data_get(bContext *C, const char *member, bContextDataResult *res
        int ret= 0;
 
        memset(result, 0, sizeof(bContextDataResult));
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        if(CTX_py_dict_get(C)) {
                return BPY_context_get(C, member, result);
 //             if (BPY_context_get(C, member, result))
index 5e2ca92..a1af728 100644 (file)
@@ -79,7 +79,7 @@
 #include "BKE_DerivedMesh.h"
 #include "BKE_curve.h"
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 #include "BPY_extern.h"
 #endif
 
@@ -489,7 +489,7 @@ int BKE_read_exotic(Scene *scene, char *name)
                                                read_stl_mesh_binary(scene, name);
                                        retval = 1;
                                }
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
                                // TODO: this should not be in the kernel...
                                else { // unknown format, call Python importloader 
                                        if (BPY_call_importloader(name)) {
@@ -499,7 +499,7 @@ int BKE_read_exotic(Scene *scene, char *name)
                                        }       
                                
                                }
-#endif /* DISABLE_PYTHON */
+#endif /* WITH_PYTHON */
                                //XXX waitcursor(0);
                        }
                }
index 1575f69..75029af 100644 (file)
@@ -53,7 +53,7 @@
 
 #include "RNA_access.h"
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 #include "BPY_extern.h" 
 #endif
 
@@ -1174,7 +1174,7 @@ void driver_free_variable (ChannelDriver *driver, DriverVar *dvar)
        else
                MEM_freeN(dvar);
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        /* since driver variables are cached, the expression needs re-compiling too */
        if(driver->type==DRIVER_TYPE_PYTHON)
                driver->flag |= DRIVER_FLAG_RENAMEVAR;
@@ -1231,7 +1231,7 @@ DriverVar *driver_add_new_variable (ChannelDriver *driver)
        /* set the default type to 'single prop' */
        driver_change_variable_type(dvar, DVAR_TYPE_SINGLE_PROP);
        
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        /* since driver variables are cached, the expression needs re-compiling too */
        if(driver->type==DRIVER_TYPE_PYTHON)
                driver->flag |= DRIVER_FLAG_RENAMEVAR;
@@ -1258,7 +1258,7 @@ void fcurve_free_driver(FCurve *fcu)
                driver_free_variable(driver, dvar);
        }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        /* free compiled driver expression */
        if (driver->expr_comp)
                BPY_DECREF(driver->expr_comp);
@@ -1406,7 +1406,7 @@ static float evaluate_driver (ChannelDriver *driver, float UNUSED(evaltime))
                        
                case DRIVER_TYPE_PYTHON: /* expression */
                {
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
                        /* check for empty or invalid expression */
                        if ( (driver->expression[0] == '\0') ||
                                 (driver->flag & DRIVER_FLAG_INVALID) )
@@ -1420,7 +1420,7 @@ static float evaluate_driver (ChannelDriver *driver, float UNUSED(evaltime))
                                 */
                                driver->curval= BPY_eval_driver(driver);
                        }
-#endif /* DISABLE_PYTHON*/
+#endif /* WITH_PYTHON*/
                }
                        break;
                
index c900f17..5ef41d1 100644 (file)
@@ -802,13 +802,13 @@ static void fcm_python_copy (FModifier *fcm, FModifier *src)
 
 static void fcm_python_evaluate (FCurve *UNUSED(fcu), FModifier *UNUSED(fcm), float *UNUSED(cvalue), float UNUSED(evaltime))
 {
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        //FMod_Python *data= (FMod_Python *)fcm->data;
        
        /* FIXME... need to implement this modifier...
         *      It will need it execute a script using the custom properties 
         */
-#endif /* DISABLE_PYTHON */
+#endif /* WITH_PYTHON */
 }
 
 static FModifierTypeInfo FMI_PYTHON = {
index 6b53e53..41c4fec 100644 (file)
@@ -27,7 +27,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 #include <Python.h>
 #endif
 
index 5ade084..e006c48 100644 (file)
@@ -96,7 +96,7 @@
 
 #include "LBM_fluidsim.h"
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 #include "BPY_extern.h"
 #endif
 
index c07032f..6ffac09 100644 (file)
@@ -36,7 +36,7 @@
 
 /*
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 #include "BPY_extern.h" // Blender Python library
 #endif
 */
index cb3c0c0..0991048 100644 (file)
@@ -53,7 +53,7 @@
 #include "BKE_text.h"
 #include "BKE_utildefines.h"
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 #include "BPY_extern.h"
 #endif
 
@@ -167,7 +167,7 @@ void free_text(Text *text)
 
        if(text->name) MEM_freeN(text->name);
        MEM_freeN(text->undo_buf);
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        if (text->compiled) BPY_free_compiled_text(text);
 #endif
 }
@@ -683,7 +683,7 @@ int txt_get_span (TextLine *from, TextLine *to)
 static void txt_make_dirty (Text *text)
 {
        text->flags |= TXT_ISDIRTY;
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        if (text->compiled) BPY_free_compiled_text(text);
 #endif
 }
index 31de453..23a96cc 100644 (file)
@@ -56,8 +56,8 @@ IF(WITH_INTERNATIONAL)
        ADD_DEFINITIONS(-DINTERNATIONAL)
 ENDIF(WITH_INTERNATIONAL)
 
-IF(NOT WITH_PYTHON)
-       ADD_DEFINITIONS(-DDISABLE_PYTHON)
-ENDIF(NOT WITH_PYTHON)
+IF(WITH_PYTHON)
+       ADD_DEFINITIONS(-DWITH_PYTHON)
+ENDIF(WITH_PYTHON)
 
 BLENDERLIB(bf_editor_interface "${SRC}" "${INC}")
index 81964a6..639a526 100644 (file)
@@ -16,7 +16,7 @@ defs = []
 if env['WITH_BF_INTERNATIONAL']:
     defs.append('INTERNATIONAL')
 
-if not env['WITH_BF_PYTHON']:
-    defs.append('DISABLE_PYTHON')
+if env['WITH_BF_PYTHON']:
+    defs.append('WITH_PYTHON')
     
 env.BlenderLib ( 'bf_editors_interface', sources, Split(incs), defs, libtype=['core'], priority=[110] )
index f65b10e..eee4f13 100644 (file)
@@ -1645,7 +1645,7 @@ int ui_set_but_string(bContext *C, uiBut *but, const char *str)
                /* number editing */
                double value;
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
                {
                        char str_unit_convert[256];
                        int unit_type;
@@ -1672,7 +1672,7 @@ int ui_set_but_string(bContext *C, uiBut *but, const char *str)
                }
 #else
                value= atof(str);
-#endif
+#endif // WITH_PYTHON
 
                if(!ui_is_but_float(but)) value= (int)floor(value + 0.5);
                if(but->type==NUMABS) value= fabs(value);
index e33e24a..81e19e5 100644 (file)
@@ -52,7 +52,7 @@
 #include "BIF_gl.h"
 
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 //#include "BPY_extern.h"
 //#include "BPY_menus.h"
 #endif
index bfcb233..224d728 100644 (file)
@@ -55,8 +55,8 @@ IF(WIN32)
        LIST(APPEND INC ${PTHREADS_INC})
 ENDIF(WIN32)
 
-IF(NOT WITH_PYTHON)
-       ADD_DEFINITIONS(-DDISABLE_PYTHON)
-ENDIF(NOT WITH_PYTHON)
+IF(WITH_PYTHON)
+       ADD_DEFINITIONS(-DWITH_PYTHON)
+ENDIF(WITH_PYTHON)
 
 BLENDERLIB(bf_editor_object "${SRC}" "${INC}")
index 98085dd..e39190c 100644 (file)
@@ -17,7 +17,7 @@ if env['OURPLATFORM'] == 'linux2':
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
     incs += ' ' + env['BF_PTHREADS_INC']
 
-if not env['WITH_BF_PYTHON']:
-    defs.append('DISABLE_PYTHON')
+if env['WITH_BF_PYTHON']:
+    defs.append('WITH_PYTHON')
 
 env.BlenderLib ( 'bf_editors_object', sources, Split(incs), defs, libtype=['core'], priority=[35] )
index 09760a8..d3b2610 100644 (file)
@@ -53,7 +53,7 @@
 #include "BKE_report.h"
 #include "BIK_api.h"
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 #include "BPY_extern.h"
 #endif
 
@@ -154,7 +154,7 @@ void validate_pyconstraint_cb (void *arg1, void *arg2)
        data->text = text;
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 /* this returns a string for the list of usable pyconstraint script names */
 char *buildmenu_pyconstraints (Text *con_text, int *pyconindex)
 {
@@ -195,12 +195,12 @@ char *buildmenu_pyconstraints (Text *con_text, int *pyconindex)
        
        return str;
 }
-#endif /* DISABLE_PYTHON */
+#endif /* WITH_PYTHON */
 
 /* this callback gets called when the 'refresh' button of a pyconstraint gets pressed */
 void update_pyconstraint_cb (void *arg1, void *arg2)
 {
-#ifdef DISABLE_PYTHON
+#ifndef WITH_PYTHON
        (void)arg1; /* unused */
        (void)arg2; /* unused */
 #else
@@ -1297,7 +1297,7 @@ static int constraint_add_exec(bContext *C, wmOperator *op, Object *ob, ListBase
                        
                case CONSTRAINT_TYPE_PYTHON: // FIXME: this code is not really valid anymore
                {
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
                        char *menustr;
                        int scriptint= 0;
                        /* popup a list of usable scripts */
index b1d9920..dbef838 100644 (file)
@@ -38,8 +38,8 @@ SET(SRC
        space_console.c
 )
 
-IF(NOT WITH_PYTHON)
-       ADD_DEFINITIONS(-DDISABLE_PYTHON)
-ENDIF(NOT WITH_PYTHON)
+IF(WITH_PYTHON)
+       ADD_DEFINITIONS(-DWITH_PYTHON)
+ENDIF(WITH_PYTHON)
 
 BLENDERLIB(bf_editor_space_console "${SRC}" "${INC}")
index 087090a..f246f08 100644 (file)
@@ -17,7 +17,7 @@ incs = [
     '../../blenloader',
 ]
 
-if not env['WITH_BF_PYTHON']:
-    defs.append('DISABLE_PYTHON')
+if env['WITH_BF_PYTHON']:
+    defs.append('WITH_PYTHON')
 
 env.BlenderLib ( 'bf_editors_space_console', sources, incs, defs, libtype=['core'], priority=[95] )
index 7026378..7247813 100644 (file)
@@ -327,7 +327,7 @@ void console_keymap(struct wmKeyConfig *keyconf)
        RNA_enum_set(WM_keymap_add_item(keymap, "CONSOLE_OT_delete", DELKEY, KM_PRESS, 0, 0)->ptr, "type", DEL_NEXT_CHAR);
        RNA_enum_set(WM_keymap_add_item(keymap, "CONSOLE_OT_delete", BACKSPACEKEY, KM_PRESS, 0, 0)->ptr, "type", DEL_PREV_CHAR);
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        WM_keymap_add_item(keymap, "CONSOLE_OT_execute", RETKEY, KM_PRESS, 0, 0); /* python operator - space_text.py */
        WM_keymap_add_item(keymap, "CONSOLE_OT_execute", PADENTER, KM_PRESS, 0, 0);
        
index 88c0ea5..17fcf22 100644 (file)
@@ -38,8 +38,7 @@ SET(SRC
 
 IF(WITH_PYTHON)
        LIST(APPEND INC ${PYTHON_INC} ../../python)
-ELSE(WITH_PYTHON)
-       ADD_DEFINITIONS(-DDISABLE_PYTHON)
+       ADD_DEFINITIONS(-DWITH_PYTHON)
 ENDIF(WITH_PYTHON)
 
 BLENDERLIB(bf_editor_space_script "${SRC}" "${INC}")
index f187df1..8c75b99 100644 (file)
@@ -10,7 +10,7 @@ incs += ' ../../python'
 
 defs = []
 
-if not env['WITH_BF_PYTHON']:
-    defs.append('DISABLE_PYTHON')
+if env['WITH_BF_PYTHON']:
+    defs.append('WITH_PYTHON')
 
 env.BlenderLib ( 'bf_editors_space_script', sources, Split(incs), defs, libtype=['core'], priority=[90] )
index 23bc385..b9ece0a 100644 (file)
@@ -46,7 +46,7 @@
 
 #include "script_intern.h"     // own include
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 #include "BPY_extern.h" /* BPY_run_python_script */
 #endif
 
@@ -54,7 +54,7 @@ static int run_pyfile_exec(bContext *C, wmOperator *op)
 {
        char path[512];
        RNA_string_get(op->ptr, "filepath", path);
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        if(BPY_run_python_script(C, path, NULL, op->reports)) {
                ARegion *ar= CTX_wm_region(C);
                ED_region_tag_redraw(ar);
@@ -84,7 +84,7 @@ void SCRIPT_OT_python_file_run(wmOperatorType *ot)
 
 static int script_reload_exec(bContext *C, wmOperator *UNUSED(op))
 {
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        /* TODO, this crashes on netrender and keying sets, need to look into why
         * disable for now unless running in debug mode */
        WM_cursor_wait(1);
index 2036b0f..57d7bba 100644 (file)
@@ -49,7 +49,7 @@
 #include "UI_resources.h"
 #include "UI_view2d.h"
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 #include "BPY_extern.h"
 #endif
 
@@ -94,7 +94,7 @@ static void script_free(SpaceLink *sl)
 {      
        SpaceScript *sscript= (SpaceScript*) sl;
 
-#ifndef DISABLE_PYTHON 
+#ifdef WITH_PYTHON
        /*free buttons references*/
        if (sscript->but_refs) {
 // XXX         BPy_Set_DrawButtonsList(sscript->but_refs);
@@ -150,7 +150,7 @@ static void script_main_area_draw(const bContext *C, ARegion *ar)
        /* data... */
        // BPY_run_python_script(C, "/root/blender-svn/blender25/test.py", NULL);
        
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        if (sscript->script) {
                //BPY_run_python_script_space(scpt->script.filename, NULL);
                BPY_run_script_space_draw(C, sscript);
index b53a86f..708fc16 100644 (file)
@@ -40,8 +40,7 @@ SET(SRC
 
 IF(WITH_PYTHON)
        LIST(APPEND INC ${PYTHON_INC} ../../python)
-ELSE(WITH_PYTHON)
-       ADD_DEFINITIONS(-DDISABLE_PYTHON)
+       ADD_DEFINITIONS(-DWITH_PYTHON)
 ENDIF(WITH_PYTHON)
 
 BLENDERLIB(bf_editor_text "${SRC}" "${INC}")
index bd87a79..6d2816b 100644 (file)
@@ -7,7 +7,7 @@ incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
 incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
 incs += ' ../../python ../../makesrna ../../blenfont'
 
-if not env['WITH_BF_PYTHON']:
-    defs.append('DISABLE_PYTHON')
+if env['WITH_BF_PYTHON']:
+    defs.append('WITH_PYTHON')
 
 env.BlenderLib ( 'bf_editors_space_text', sources, Split(incs), defs, libtype=['core'], priority=[95] )
index 464e144..b7bf614 100644 (file)
@@ -57,7 +57,7 @@
 
 
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 // XXX #include "BPY_menus.h"
 #endif
 
index af29e57..d2defb0 100644 (file)
@@ -58,7 +58,7 @@
 #include "RNA_access.h"
 #include "RNA_define.h"
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 #include "BPY_extern.h"
 #endif
 
@@ -310,7 +310,7 @@ static int reload_exec(bContext *C, wmOperator *op)
                return OPERATOR_CANCELLED;
        }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        if(text->compiled)
                BPY_free_compiled_text(text);
 #endif
@@ -557,7 +557,7 @@ static int run_script_poll(bContext *C)
 
 static int run_script_exec(bContext *C, wmOperator *op)
 {
-#ifdef DISABLE_PYTHON
+#ifndef WITH_PYTHON
        (void)C; /* unused */
 
        BKE_report(op->reports, RPT_ERROR, "Python disabled in this build");
@@ -597,7 +597,7 @@ void TEXT_OT_run_script(wmOperatorType *ot)
 
 static int refresh_pyconstraints_exec(bContext *UNUSED(C), wmOperator *UNUSED(op))
 {
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 #if 0
        Text *text= CTX_data_edit_text(C);
        Object *ob;
index 6e64bef..720e80e 100644 (file)
@@ -358,7 +358,7 @@ short do_texttools(SpaceText *st, char ascii, unsigned short evnt, short val)
 }
 
 #if 0
-#ifndef DISABLE_PYTHON 
+#ifdef WITH_PYTHON     
        /* Run text plugin scripts if enabled */
        if(st->doplugins && event && val) {
                if(BPY_menu_do_shortcut(PYMENU_TEXTPLUGIN, event, qual)) {
index a4f661e..37a3a65 100644 (file)
@@ -156,7 +156,7 @@ static int ed_undo_step(bContext *C, int step, const char *undoname)
                
                if(do_glob_undo) {
                        if(U.uiflag & USER_GLOBALUNDO) {
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
                                // XXX          BPY_scripts_clear_pyobjects();
 #endif
                                if(undoname)
index 68a292d..d8937d0 100644 (file)
@@ -51,8 +51,8 @@ if env['WITH_BF_GAMEENGINE']:
 if env['BF_UNIT_TEST']:
     defs.append('UNIT_TEST')
 
-if not env['WITH_BF_PYTHON']:
-    defs.append('DISABLE_PYTHON')
+if env['WITH_BF_PYTHON']:
+    defs.append('WITH_PYTHON')
 
 if env['OURPLATFORM'] == 'linux2':
     cflags='-pthread'
index 6ca5203..d021900 100644 (file)
@@ -65,16 +65,16 @@ INCLUDE_DIRECTORIES(
 
 FILE(GLOB INC_FILES ../*.h ../../makesdna/*.h)
 
-IF(NOT WITH_PYTHON)
-       ADD_DEFINITIONS(-DDISABLE_PYTHON)
-ENDIF(NOT WITH_PYTHON)
+IF(WITH_PYTHON)
+       ADD_DEFINITIONS(-DWITH_PYTHON)
+ENDIF(WITH_PYTHON)
 
 IF(WIN32)
        LIST(APPEND INC ${PTHREADS_INC})
 ENDIF(WIN32)
 
 IF(WITH_GAMEENGINE)
-       ADD_DEFINITIONS(-DWITH_GAME_ENGINE)
+       ADD_DEFINITIONS(-DWITH_GAMEENGINE)
 ENDIF(WITH_GAMEENGINE)
 
 IF(WITH_IMAGE_OPENEXR)
index b37cfd5..b8e30bc 100644 (file)
@@ -85,8 +85,8 @@ if env['WITH_BF_JACK']:
 if env['BF_UNIT_TEST']:
     defs.append('UNIT_TEST')
 
-if not env['WITH_BF_PYTHON']:
-    defs.append('DISABLE_PYTHON')
+if env['WITH_BF_PYTHON']:
+    defs.append('WITH_PYTHON')
 
 if env['OURPLATFORM'] == 'linux2':
     cflags='-pthread'
index 1bc22b7..f8c262d 100644 (file)
@@ -649,7 +649,7 @@ static void rna_wmClipboard_set(PointerRNA *ptr, const char *value)
        WM_clipboard_text_set((void *) value, FALSE);
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 static void rna_Operator_unregister(const bContext *C, StructRNA *type)
 {
        char *idname;
@@ -952,7 +952,7 @@ static StructRNA *rna_MacroOperator_register(const bContext *C, ReportList *repo
 
        return dummyot.ext.srna;
 }
-#endif /* DISABLE_PYTHON */
+#endif /* WITH_PYTHON */
 
 static StructRNA* rna_Operator_refine(PointerRNA *opr)
 {
@@ -1061,7 +1061,7 @@ static void rna_def_operator(BlenderRNA *brna)
        RNA_def_struct_ui_text(srna, "Operator", "Storage of an operator being executed, or registered after execution");
        RNA_def_struct_sdna(srna, "wmOperator");
        RNA_def_struct_refine_func(srna, "rna_Operator_refine");
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        RNA_def_struct_register_funcs(srna, "rna_Operator_register", "rna_Operator_unregister");
 #endif
 
@@ -1124,7 +1124,7 @@ static void rna_def_macro_operator(BlenderRNA *brna)
        RNA_def_struct_ui_text(srna, "Macro Operator", "Storage of a macro operator being executed, or registered after execution");
        RNA_def_struct_sdna(srna, "wmOperator");
        RNA_def_struct_refine_func(srna, "rna_MacroOperator_refine");
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        RNA_def_struct_register_funcs(srna, "rna_MacroOperator_register", "rna_Operator_unregister");
 #endif
     
index d4383f3..5a6470d 100644 (file)
@@ -146,8 +146,7 @@ ENDIF(WIN32)
 
 IF(WITH_PYTHON)
        SET(INC ${INC} ../python ${PYTHON_INC})
-ELSE(WITH_PYTHON)
-       ADD_DEFINITIONS(-DDISABLE_PYTHON)
+       ADD_DEFINITIONS(-DWITH_PYTHON)
 ENDIF(WITH_PYTHON)
 
 BLENDERLIB(bf_nodes "${SRC}" "${INC}")
index 3e7e0db..4bed612 100644 (file)
@@ -22,10 +22,9 @@ defs = []
 if env['WITH_BF_PYTHON']:
     incs += ' ' + env['BF_PYTHON_INC']
     incs += ' ../python'
+    defs.append('WITH_PYTHON')
     if env['BF_DEBUG']:
         defs.append('_DEBUG')
-else:
-    defs.append('DISABLE_PYTHON')
 
 if env['OURPLATFORM'] == 'linux2':
     cflags='-pthread'
index 5e391e0..a548893 100644 (file)
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef DISABLE_PYTHON
+/* TODO, support python3.x */
+#undef WITH_PYTHON 
+
+#ifdef WITH_PYTHON
 #include <Python.h>
 #include <compile.h>
 #include <eval.h>
 #endif
 
-/* TODO, support python3.x */
-#define DISABLE_PYTHON 1
-
 #include "DNA_text_types.h"
 #include "BKE_text.h"
 #include "BKE_utildefines.h"
 
 // XXX
 #if 0
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 #include "api2_2x/Node.h"
 #include "api2_2x/gen_utils.h"
 #include "BPY_extern.h"
@@ -57,7 +57,7 @@ static void node_dynamic_setup(bNode *node);
 static void node_dynamic_exec_cb(void *data, bNode *node, bNodeStack **in, bNodeStack **out);
 static void node_dynamic_free_storage_cb(bNode *node);
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 static PyObject *init_dynamicdict(void) {
        PyObject *newscriptdict, *item;
        PyGILState_STATE gilstate = PyGILState_Ensure();
@@ -156,7 +156,7 @@ static void node_dynamic_update_socket_links(bNode *node, bNodeTree *ntree)
 
 static void node_dynamic_free_storage_cb(bNode *node)
 {
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        NodeScriptDict *nsd;
        PyObject *pydict;
        BPy_Node *pynode;
@@ -186,7 +186,7 @@ static void node_dynamic_disable(bNode *node)
 /* Disable all pynodes using the given text (script) id */
 static void node_dynamic_disable_all_by_id(ID *id)
 {
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        Material *ma; /* XXX hardcoded for shaders */
 
        for (ma= G.main->mat.first; ma; ma= ma->id.next) {
@@ -346,7 +346,7 @@ int nodeDynamicUnlinkText(ID *txtid) {
 
 static void node_dynamic_pyerror_print(bNode *node)
 {
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        PyGILState_STATE gilstate = PyGILState_Ensure();
 
        fprintf(stderr, "\nError in dynamic node script \"%s\":\n", node->name);
@@ -373,7 +373,7 @@ static void node_dynamic_register_type(bNode *node)
        node->typeinfo->name = BLI_strdup(node->name);
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 /* node_dynamic_get_pynode:
  * Find the pynode definition from the script */
 static PyObject *node_dynamic_get_pynode(PyObject *dict)
@@ -415,11 +415,11 @@ static PyObject *node_dynamic_get_pynode(PyObject *dict)
                "no PyNode definition found in the script!");
        return NULL;
 }
-#endif /* DISABLE_PYTHON */
+#endif /* WITH_PYTHON */
 
 static int node_dynamic_parse(struct bNode *node)
 {
-#ifdef DISABLE_PYTHON
+#ifndef WITH_PYTHON
        return -1;
 #else
        PyObject *dict= NULL;
@@ -516,7 +516,7 @@ static int node_dynamic_parse(struct bNode *node)
  * pynodes already linked to a script (node->id != NULL). */
 static void node_dynamic_setup(bNode *node)
 {
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        NodeScriptDict *nsd = NULL;
        bNodeTree *nodetree = NULL;
        bNodeType *ntype = NULL;
@@ -640,7 +640,7 @@ static void node_dynamic_setup(bNode *node)
        node->custom1 = BSET(node->custom1, NODE_DYNAMIC_READY);
 
        PyGILState_Release(gilstate);
-#endif /* DISABLE_PYTHON */
+#endif /* WITH_PYTHON */
        return;
 }
 
@@ -673,7 +673,7 @@ static void node_dynamic_init_cb(bNode *node) {
 /* node_dynamic_copy_cb: pynode copy callback */
 static void node_dynamic_copy_cb(bNode *orig_node, bNode *new_node)
 {
-#ifdef DISABLE_PYTHON
+#ifndef WITH_PYTHON
        return;
 #else
        NodeScriptDict *nsd;
@@ -698,7 +698,7 @@ static void node_dynamic_copy_cb(bNode *orig_node, bNode *new_node)
 /* node_dynamic_exec_cb: the execution callback called per pixel
  * during rendering. */
 static void node_dynamic_exec_cb(void *data, bNode *node, bNodeStack **in, bNodeStack **out) {
-#ifdef DISABLE_PYTHON
+#ifndef WITH_PYTHON
        return;
 #else
        BPy_Node *mynode = NULL;
index fa3a196..6c93334 100644 (file)
@@ -86,8 +86,7 @@ ENDIF(WITH_FFMPEG)
 
 IF(WITH_PYTHON)
        LIST(APPEND INC ../python ${PYTHON_INC})
-ELSE(WITH_PYTHON)
-       ADD_DEFINITIONS(-DDISABLE_PYTHON)
+       ADD_DEFINITIONS(-DWITH_PYTHON)
 ENDIF(WITH_PYTHON)
 
 IF(WITH_GAMEENGINE)
index 51168d7..cbaf74d 100644 (file)
@@ -16,8 +16,8 @@ incs += ' #/intern/elbeem #/extern/glew/include'
 
 defs = [ 'GLEW_STATIC' ]
 
-if not env['WITH_BF_PYTHON']:
-    defs.append('DISABLE_PYTHON')
+if env['WITH_BF_PYTHON']:
+    defs.append('WITH_PYTHON')
 
 if env['WITH_BF_COLLADA']:
     defs.append('WITH_COLLADA')
index 5c4912d..4260692 100644 (file)
@@ -58,7 +58,7 @@
 
 #include "ED_screen.h"
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 #include "BPY_extern.h"
 #endif
 
@@ -69,7 +69,7 @@
 void WM_operator_free(wmOperator *op)
 {
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        if(op->py_instance) {
                /* do this first incase there are any __del__ functions or
                 * similar that use properties */
index 6db7f25..aa99e8f 100644 (file)
@@ -96,7 +96,7 @@
 
 #include "GPU_draw.h"
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 #include "BPY_extern.h"
 #endif
 
@@ -317,7 +317,7 @@ void WM_read_file(bContext *C, char *name, ReportList *reports)
                ED_editors_init(C);
                DAG_on_load_update(CTX_data_main(C));
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
                /* run any texts that were loaded in and flagged as modules */
                BPY_load_user_modules(C);
 #endif
@@ -400,7 +400,7 @@ int WM_read_homefile(bContext *C, wmOperator *op)
        ED_editors_init(C);
        DAG_on_load_update(CTX_data_main(C));
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        if(CTX_py_init_get(C)) {
                /* sync addons, these may have changed from the defaults */
                BPY_eval_string(C, "__import__('bpy').utils.addon_reset_all()");
index b8e6cf5..d98459a 100644 (file)
 
 #include "RE_pipeline.h"               /* RE_ free stuff */
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 #include "BPY_extern.h"
 #endif
 
-#ifdef WITH_GAME_ENGINE
+#ifdef WITH_GAMEENGINE
 #include "SYS_System.h"
 #endif
 
@@ -143,7 +143,7 @@ void WM_init(bContext *C, int argc, char **argv)
         * before WM_read_homefile() or make py-drivers check if python is running.
         * Will try fix when the crash can be repeated. - campbell. */
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        BPY_set_context(C); /* necessary evil */
        BPY_start_python(argc, argv);
        BPY_load_user_modules(C);
@@ -398,7 +398,7 @@ void WM_exit(bContext *C)
 //     free_txt_data();
        
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        /* XXX - old note */
        /* before free_blender so py's gc happens while library still exists */
        /* needed at least for a rare sigsegv that can happen in pydrivers */
@@ -434,7 +434,7 @@ void WM_exit(bContext *C)
        wm_ghost_exit();
 
        CTX_free(C);
-#ifdef WITH_GAME_ENGINE
+#ifdef WITH_GAMEENGINE
        SYS_DeleteSystem(SYS_GetSystem());
 #endif
        if(MEM_get_memory_blocks_in_use()!=0) {
index c8885cb..c661f6b 100644 (file)
@@ -74,8 +74,7 @@ ENDIF(WITH_IMAGE_HDR)
 
 IF(WITH_PYTHON)
        INCLUDE_DIRECTORIES(../blender/python)
-ELSE(WITH_PYTHON)
-       ADD_DEFINITIONS(-DDISABLE_PYTHON)
+       ADD_DEFINITIONS(-DWITH_PYTHON)
 ENDIF(WITH_PYTHON)
 
 IF(WITH_GAMEENGINE)
index 6ee9aea..8577872 100644 (file)
@@ -31,10 +31,9 @@ if not env['WITH_BF_SDL']:
 
 if env['WITH_BF_PYTHON']:
     incs += ' ../blender/python'
+    defs.append('WITH_PYTHON')
     if env['BF_DEBUG']:
         defs.append('_DEBUG')
-else:
-    defs.append('DISABLE_PYTHON')
     
 if env['BF_BUILDINFO']:
     defs.append('BUILD_DATE')
index 0d7a313..4a217a1 100644 (file)
@@ -80,7 +80,7 @@
 
 #include "IMB_imbuf.h" // for IMB_init
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 #include "BPY_extern.h"
 #endif
 
@@ -829,7 +829,7 @@ static int set_skip_frame(int argc, char **argv, void *data)
 }
 
 /* macro for ugly context setup/reset */
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 #define BPY_CTX_SETUP(_cmd) \
 { \
        wmWindowManager *wm= CTX_wm_manager(C); \
@@ -847,11 +847,11 @@ static int set_skip_frame(int argc, char **argv, void *data)
        CTX_data_scene_set(C, prevscene); \
 } \
 
-#endif /* DISABLE_PYTHON */
+#endif /* WITH_PYTHON */
 
 static int run_python(int argc, char **argv, void *data)
 {
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        bContext *C = data;
 
        /* workaround for scripts not getting a bpy.context.scene, causes internal errors elsewhere */
@@ -872,12 +872,12 @@ static int run_python(int argc, char **argv, void *data)
        (void)argc; (void)argv; (void)data; /* unused */
        printf("This blender was built without python support\n");
        return 0;
-#endif /* DISABLE_PYTHON */
+#endif /* WITH_PYTHON */
 }
 
 static int run_python_console(int UNUSED(argc), char **argv, void *data)
 {
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        bContext *C = data;     
        const char *expr= "__import__('code').interact()";
 
@@ -888,7 +888,7 @@ static int run_python_console(int UNUSED(argc), char **argv, void *data)
        (void)argv; (void)data; /* unused */
        printf("This blender was built without python support\n");
        return 0;
-#endif /* DISABLE_PYTHON */
+#endif /* WITH_PYTHON */
 }
 
 static int load_file(int UNUSED(argc), char **argv, void *data)
@@ -914,7 +914,7 @@ static int load_file(int UNUSED(argc), char **argv, void *data)
                }
 
                /* WM_read_file() runs normally but since we're in background mode do here */
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
                /* run any texts that were loaded in and flagged as modules */
                BPY_load_user_modules(C);
 #endif
@@ -1150,7 +1150,7 @@ int main(int argc, char **argv)
 
                BLI_where_is_temp( btempdir, 0 ); /* call after loading the startup.blend so we can read U.tempdir */
        }
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        /**
         * NOTE: the U.pythondir string is NULL until WM_init() is executed,
         * so we provide the BPY_ function below to append the user defined
index 858a596..9de4020 100644 (file)
@@ -142,7 +142,7 @@ extern "C" void StartKetsjiShell(struct bContext *C, struct ARegion *ar, rcti *c
 
        BLI_strncpy(pathname, blenderdata->name, sizeof(pathname));
        BLI_strncpy(oldsce, G.main->name, sizeof(oldsce));
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        resetGamePythonPath(); // need this so running a second time wont use an old blendfiles path
        setGamePythonPath(G.main->name);
 
@@ -172,7 +172,7 @@ extern "C" void StartKetsjiShell(struct bContext *C, struct ARegion *ar, rcti *c
                bool frameRate = (SYS_GetCommandLineInt(syshandle, "show_framerate", 0) != 0);
                bool animation_record = (SYS_GetCommandLineInt(syshandle, "animation_record", 0) != 0);
                bool displaylists = (SYS_GetCommandLineInt(syshandle, "displaylists", 0) != 0);
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
                bool nodepwarnings = (SYS_GetCommandLineInt(syshandle, "ignore_deprecation_warnings", 0) != 0);
 #endif
                bool novertexarrays = (SYS_GetCommandLineInt(syshandle, "novertexarrays", 0) != 0);
@@ -221,7 +221,7 @@ extern "C" void StartKetsjiShell(struct bContext *C, struct ARegion *ar, rcti *c
                ketsjiengine->SetUseFixedTime(usefixed);
                ketsjiengine->SetTimingDisplay(frameRate, profile, properties);
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
                CValue::SetDeprecationWarnings(nodepwarnings);
 #endif
 
@@ -311,7 +311,7 @@ extern "C" void StartKetsjiShell(struct bContext *C, struct ARegion *ar, rcti *c
                                if(blenderdata) {
                                        BLI_strncpy(G.main->name, blenderdata->name, sizeof(G.main->name));
                                        BLI_strncpy(pathname, blenderdata->name, sizeof(pathname));
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
                                        setGamePythonPath(G.main->name);
 #endif
                                }
@@ -382,11 +382,11 @@ extern "C" void StartKetsjiShell(struct bContext *C, struct ARegion *ar, rcti *c
                                scene,
                                canvas);
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
                        // some python things
                        PyObject *gameLogic, *gameLogic_keys;
                        setupGamePython(ketsjiengine, startscene, blenderdata, pyGlobalDict, &gameLogic, &gameLogic_keys, 0, NULL);
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
                        //initialize Dome Settings
                        if(scene->gm.stereoflag == STEREO_DOME)
@@ -477,7 +477,7 @@ extern "C" void StartKetsjiShell(struct bContext *C, struct ARegion *ar, rcti *c
 
 
                                // when exiting the mainloop
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
                                // Clears the dictionary by hand:
                                // This prevents, extra references to global variables
                                // inside the GameLogic dictionary when the python interpreter is finalized.
@@ -499,7 +499,7 @@ extern "C" void StartKetsjiShell(struct bContext *C, struct ARegion *ar, rcti *c
                                gameLogic_keys_new = NULL;
 #endif
                                ketsjiengine->StopEngine();
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
                                exitGamePythonScripting();
 #endif
                                networkdevice->Disconnect();
@@ -510,7 +510,7 @@ extern "C" void StartKetsjiShell(struct bContext *C, struct ARegion *ar, rcti *c
                                sceneconverter = NULL;
                        }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
                        Py_DECREF(gameLogic_keys);
                        gameLogic_keys = NULL;
 #endif
@@ -575,7 +575,7 @@ extern "C" void StartKetsjiShell(struct bContext *C, struct ARegion *ar, rcti *c
 
        BLI_strncpy(G.main->name, oldsce, sizeof(G.main->name));
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        Py_DECREF(pyGlobalDict);
 
        // Release Python's GIL
index 7abdeba..1f895ad 100644 (file)
@@ -51,8 +51,7 @@ ENDIF(WITH_FFMPEG)
 
 IF(WITH_PYTHON)
        LIST(APPEND INC ${PYTHON_INC})
-ELSE(WITH_PYTHON)
-       ADD_DEFINITIONS(-DDISABLE_PYTHON)
+       ADD_DEFINITIONS(-DWITH_PYTHON)
 ENDIF(WITH_PYTHON)
 
 BLENDERLIB(bf_blroutines "${SRC}" "${INC}")
index 1a774fc..91dc269 100644 (file)
@@ -27,8 +27,7 @@ if env['WITH_BF_FFMPEG']:
 
 if env['WITH_BF_PYTHON']:
     incs += ' ' + env['BF_PYTHON_INC']
-else:
-    defs.append('DISABLE_PYTHON')
+    defs.append('WITH_PYTHON')
 
 if env['WITH_BF_CXX_GUARDEDALLOC']:
     defs.append('WITH_CXX_GUARDEDALLOC')
index b8d4c4e..39e3e87 100644 (file)
@@ -428,7 +428,7 @@ bool BL_ActionActuator::Update(double curtime, bool frame)
        return keepgoing;
 };
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* ------------------------------------------------------------------------- */
 /* Python functions                                                          */
@@ -674,4 +674,4 @@ PyObject* BL_ActionActuator::pyattr_get_channel_names(void *self_v, const KX_PYA
        return ret;
 }
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
index 10ce1fa..9682c0e 100644 (file)
@@ -84,7 +84,7 @@ public:
        bAction*        GetAction() { return m_action; }
        void            SetAction(bAction* act) { m_action= act; }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
        KX_PYMETHOD_O(BL_ActionActuator,GetChannel);
        KX_PYMETHOD_DOC(BL_ActionActuator,setChannel);
@@ -131,7 +131,7 @@ public:
                                return 1;
                }
        }
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
        
 protected:
 
index 82b8307..db36f7e 100644 (file)
@@ -175,7 +175,7 @@ bool BL_ArmatureActuator::Update(double curtime, bool frame)
        return result;
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* ------------------------------------------------------------------------- */
 /* Python Integration Hooks                                                                     */
@@ -257,5 +257,5 @@ PyObject* BL_ArmatureActuator::pyattr_get_constraint(void *self, const struct KX
                return constraint->GetProxy();
 }
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
index 72e2e96..b3f9ee2 100644 (file)
@@ -66,14 +66,14 @@ public:
        virtual bool Update(double curtime, bool frame);
        virtual void ReParent(SCA_IObject* parent);
        
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
        /* These are used to get and set m_target */
        static PyObject* pyattr_get_constraint(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
        static PyObject* pyattr_get_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
        static int pyattr_set_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 private:
        // identify the constraint that this actuator controls
index 8f5ec23..13de701 100644 (file)
@@ -33,7 +33,7 @@
 #include "BLI_math.h"
 #include "BLI_string.h"
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 PyTypeObject BL_ArmatureChannel::Type = {
        PyVarObject_HEAD_INIT(NULL, 0)
@@ -72,7 +72,7 @@ PyObject *BL_ArmatureChannel::NewProxy(bool py_owns)
        return NewProxyPlus_Ext(this, &Type, m_posechannel, py_owns);
 }
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 BL_ArmatureChannel::BL_ArmatureChannel(
        BL_ArmatureObject *armature, 
@@ -85,7 +85,7 @@ BL_ArmatureChannel::~BL_ArmatureChannel()
 {
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 // PYTHON
 
@@ -461,4 +461,4 @@ PyObject *BL_ArmatureBone::py_bone_get_children(void *self, const struct KX_PYAT
        return childrenlist;
 }
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
index 79f0cc8..e1c1821 100644 (file)
@@ -57,7 +57,7 @@ public:
                                                struct bPoseChannel *posechannel);
        virtual ~BL_ArmatureChannel();
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        // Python access
        virtual PyObject* py_repr(void);
 
@@ -65,7 +65,7 @@ public:
        static int py_attr_setattr(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
        static PyObject* py_attr_get_joint_rotation(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
        static int py_attr_set_joint_rotation(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 };
 
 /* this is a factory class to access bBone data field in the GE.
@@ -82,7 +82,7 @@ private:
 
 public:
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        static PyObject *py_bone_repr(PyObject *self);
        static PyObject *py_bone_get_parent(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
        static PyObject *py_bone_get_children(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
index 0b7ab04..fa7f8a1 100644 (file)
@@ -33,7 +33,7 @@
 #include "BLI_math.h"
 #include "BLI_string.h"
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 PyTypeObject BL_ArmatureConstraint::Type = {
        PyVarObject_HEAD_INIT(NULL, 0)
@@ -62,7 +62,7 @@ PyObject* BL_ArmatureConstraint::py_repr(void)
        return PyUnicode_FromString(m_name);
 }
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 BL_ArmatureConstraint::BL_ArmatureConstraint(
        BL_ArmatureObject *armature, 
@@ -237,7 +237,7 @@ void BL_ArmatureConstraint::SetSubtarget(KX_GameObject* subtarget)
 
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 // PYTHON
 
@@ -447,4 +447,4 @@ int BL_ArmatureConstraint::py_attr_setattr(void *self_v, const struct KX_PYATTRI
        return PY_SET_ATTR_FAIL;
 }
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
index a9f612b..92da832 100644 (file)
@@ -104,14 +104,14 @@ public:
        void SetTarget(KX_GameObject* target);
        void SetSubtarget(KX_GameObject* subtarget);
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
        // Python access
        virtual PyObject* py_repr(void);
 
        static PyObject* py_attr_getattr(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
        static int py_attr_setattr(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 };
 
 #endif //__BL_ARMATURECONSTRAINT
index 97d6b6e..0c5bb03 100644 (file)
@@ -594,7 +594,7 @@ float BL_ArmatureObject::GetBoneLength(Bone* bone) const
        return (float)(MT_Point3(bone->head) - MT_Point3(bone->tail)).length();
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 // PYTHON
 
@@ -661,4 +661,4 @@ KX_PYMETHODDEF_DOC_NOARGS(BL_ArmatureObject, update,
        Py_RETURN_NONE;
 }
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
index 646e9d4..525c265 100644 (file)
@@ -108,14 +108,14 @@ public:
 
        virtual int GetGameObjectType() { return OBJ_ARMATURE; }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
        // PYTHON
        static PyObject* pyattr_get_constraints(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
        static PyObject* pyattr_get_channels(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
        KX_PYMETHOD_DOC_NOARGS(BL_ArmatureObject, update);
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 protected:
        /* list element: BL_ArmatureConstraint. Use SG_DListHead to have automatic list replication */
index 08d3e54..ccd7dc6 100644 (file)
@@ -408,7 +408,7 @@ bool BL_ShapeActionActuator::Update(double curtime, bool frame)
        return keepgoing;
 };
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* ------------------------------------------------------------------------- */
 /* Python functions                                                          */
@@ -491,4 +491,4 @@ int BL_ShapeActionActuator::pyattr_set_action(void *self_v, const KX_PYATTRIBUTE
 
 }
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
index 64cd21e..e6457e2 100644 (file)
@@ -82,7 +82,7 @@ public:
        bAction*        GetAction() { return m_action; }
        void            SetAction(bAction* act) { m_action= act; }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
        static PyObject*        pyattr_get_action(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
        static int                      pyattr_set_action(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
@@ -125,7 +125,7 @@ public:
 
        }
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 protected:
 
index a23629e..9e0b424 100644 (file)
@@ -85,8 +85,7 @@ SET(SRC
 
 IF(WITH_PYTHON)
        LIST(APPEND INC ${PYTHON_INC})
-ELSE(WITH_PYTHON)
-       ADD_DEFINITIONS(-DDISABLE_PYTHON)
+       ADD_DEFINITIONS(-DWITH_PYTHON)
 ENDIF(WITH_PYTHON)
 
 IF(WITH_BULLET)
index 7ec7104..05b0e75 100644 (file)
@@ -906,7 +906,7 @@ void        KX_BlenderSceneConverter::TestHandlesPhysicsObjectToAnimationIpo()
 
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 PyObject *KX_BlenderSceneConverter::GetPyNamespace()
 {
        return m_ketsjiEngine->GetPyNamespace();
index 20f3f86..8692a75 100644 (file)
@@ -174,7 +174,7 @@ public:
 
 
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        PyObject *GetPyNamespace();
 #endif
        
index a6b62ec..3bca6b9 100644 (file)
@@ -153,7 +153,7 @@ void BL_ConvertControllers(
                                bPythonCont* pycont = (bPythonCont*) bcontr->data;
                                SCA_PythonController* pyctrl = new SCA_PythonController(gameobj, pycont->mode);
                                gamecontroller = pyctrl;
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
                                pyctrl->SetNamespace(converter->GetPyNamespace());
                                
@@ -183,7 +183,7 @@ void BL_ConvertControllers(
                                        }
                                }
                                
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
                                break;
                        }
@@ -210,7 +210,7 @@ void BL_ConvertControllers(
                        
                        converter->RegisterGameController(gamecontroller, bcontr);
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
                        if (bcontr->type==CONT_PYTHON) {
                                SCA_PythonController *pyctrl= static_cast<SCA_PythonController*>(gamecontroller);
                                /* not strictly needed but gives syntax errors early on and
@@ -225,7 +225,7 @@ void BL_ConvertControllers(
                                        // pyctrl->Import();
                                }
                        }
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
                        //done with gamecontroller
                        gamecontroller->Release();
index 44c0ad3..6c85000 100644 (file)
@@ -126,7 +126,7 @@ void BL_ConvertProperties(Object* object,KX_GameObject* gameobj,SCA_TimeEventMan
                        propval->Release();
                }
                
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
                /* Warn if we double up on attributes, this isnt quite right since it wont find inherited attributes however there arnt many */
                for(PyAttributeDef *attrdef = KX_GameObject::Attributes; attrdef->m_name; attrdef++) {
                        if(strcmp(prop->name, attrdef->m_name)==0) {
@@ -141,7 +141,7 @@ void BL_ConvertProperties(Object* object,KX_GameObject* gameobj,SCA_TimeEventMan
                        }
                }
                /* end warning check */
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
                prop = prop->next;
        }
index a276d16..f6cf233 100644 (file)
@@ -29,8 +29,7 @@ if env['BF_DEBUG']:
         
 if env['WITH_BF_PYTHON']:
     incs += ' ' + env['BF_PYTHON_INC']
-else:
-    defs.append('DISABLE_PYTHON')
+    defs.append('WITH_PYTHON')
 
 if env['WITH_BF_CXX_GUARDEDALLOC']:
     defs.append('WITH_CXX_GUARDEDALLOC')
index e6bb454..5510554 100644 (file)
@@ -201,9 +201,9 @@ CValue* CBoolValue::GetReplica()
        return replica;
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 PyObject* CBoolValue::ConvertValueToPython()
 {
        return PyBool_FromLong(m_bool != 0);
 }
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
index dac70e3..8110b97 100644 (file)
@@ -45,7 +45,7 @@ public:
        
        void                            Configure(CValue* menuvalue);
        virtual CValue*         GetReplica();
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        virtual PyObject*       ConvertValueToPython();
 #endif
 
index 828afa7..ad446d1 100644 (file)
@@ -58,8 +58,7 @@ SET(SRC
 
 IF(WITH_PYTHON)
        LIST(APPEND INC ${PYTHON_INC})
-ELSE(WITH_PYTHON)
-       ADD_DEFINITIONS(-DDISABLE_PYTHON)
+       ADD_DEFINITIONS(-DWITH_PYTHON)
 ENDIF(WITH_PYTHON)
 
 BLENDERLIB(bf_expressions "${SRC}" "${INC}")
index 82c86ac..e001213 100644 (file)
@@ -310,9 +310,9 @@ CValue* CFloatValue::GetReplica()
 }
 
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 PyObject* CFloatValue::ConvertValueToPython()
 {
        return PyFloat_FromDouble(m_float);
 }
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
index 49d4efa..83b9ff1 100644 (file)
@@ -36,7 +36,7 @@ public:
        virtual CValue* GetReplica();
        virtual CValue* Calc(VALUE_OPERATOR op, CValue *val);
        virtual CValue* CalcFinal(VALUE_DATA_TYPE dtype, VALUE_OPERATOR op, CValue *val);
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        virtual PyObject*       ConvertValueToPython();
 #endif
 
index 83e5720..5ba57e7 100644 (file)
@@ -322,7 +322,7 @@ void CIntValue::SetValue(CValue* newval)
 }
 
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 PyObject* CIntValue::ConvertValueToPython()
 {
        if((m_int > INT_MIN) && (m_int < INT_MAX))
@@ -330,4 +330,4 @@ PyObject* CIntValue::ConvertValueToPython()
        else
                return PyLong_FromLongLong(m_int);
 }
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
index 63efea5..e484c43 100644 (file)
@@ -48,7 +48,7 @@ public:
        void                    AddConfigurationData(CValue* menuvalue);
        virtual CValue* GetReplica();
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        virtual PyObject*       ConvertValueToPython();
 #endif
 
index 7901d52..62353f0 100644 (file)
@@ -40,7 +40,7 @@
 #undef _POSIX_C_SOURCE
 #endif
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 #include "Python.h"
 
 #define USE_MATHUTILS // Blender 2.5x api will use mathutils, for a while we might want to test without it
index 4d9d82e..258aada 100644 (file)
@@ -268,7 +268,7 @@ bool CListValue::IsModified()
        return bmod;
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* --------------------------------------------------------------------- */
 /* Python interface ---------------------------------------------------- */
@@ -674,4 +674,4 @@ PyObject* CListValue::Pyfrom_id(PyObject* value)
 
 }
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
index 8f3b9dc..ff675dd 100644 (file)
@@ -60,7 +60,7 @@ public:
 
        bool CheckEqual(CValue* first,CValue* second);
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        virtual PyObject* py_repr(void) {
                PyObject *py_proxy= this->GetProxy();
                PyObject *py_list= PySequence_List(py_proxy);
index 32bf4ba..9195bd6 100644 (file)
@@ -49,7 +49,7 @@
 
 PyObjectPlus::~PyObjectPlus()
 {
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        if(m_proxy) {
                BGE_PROXY_REF(m_proxy)= NULL;
                Py_DECREF(m_proxy);                     /* Remove own reference, python may still have 1 */
@@ -60,14 +60,14 @@ PyObjectPlus::~PyObjectPlus()
 
 PyObjectPlus::PyObjectPlus() : SG_QList()                              // constructor
 {
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        m_proxy= NULL;
 #endif
 };
 
 void PyObjectPlus::ProcessReplica()
 {
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        /* Clear the proxy, will be created again if needed with GetProxy()
         * otherwise the PyObject will point to the wrong reference */
        m_proxy= NULL;
@@ -84,7 +84,7 @@ void PyObjectPlus::ProcessReplica()
  */
 void PyObjectPlus::InvalidateProxy()           // check typename of each parent
 {
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        if(m_proxy) {
                BGE_PROXY_REF(m_proxy)=NULL;
                Py_DECREF(m_proxy);
@@ -94,7 +94,7 @@ void PyObjectPlus::InvalidateProxy()          // check typename of each parent
 }
 
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /*------------------------------
  * PyObjectPlus Type           -- Every class, even the abstract one should have a Type
@@ -1224,4 +1224,4 @@ void                      PyObjectPlus::SetDeprecationWarningFirst(WarnLink* wlink) {m_base_wlink_f
 void                   PyObjectPlus::SetDeprecationWarningLinkLast(WarnLink* wlink) {m_base_wlink_last= wlink;}
 void                   PyObjectPlus::NullDeprecationWarning() {m_base_wlink_first= m_base_wlink_last= NULL;}
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
index b268823..d69be6a 100644 (file)
@@ -43,7 +43,7 @@
  * Python defines
 ------------------------------*/
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 #ifdef USE_MATHUTILS
 extern "C" {
 #include "../../blender/python/generic/mathutils.h" /* so we can have mathutils callbacks */
@@ -459,7 +459,7 @@ typedef struct KX_PYATTRIBUTE_DEF {
 ------------------------------*/
 typedef PyTypeObject * PyParentObject;                         // Define the PyParent Object
 
-#else // DISABLE_PYTHON
+#else // WITH_PYTHON
 
 #ifdef WITH_CXX_GUARDEDALLOC
 #define Py_Header \
@@ -505,7 +505,7 @@ public:
        
        virtual ~PyObjectPlus();                                        // destructor
        
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        PyObject *m_proxy; /* actually a PyObjectPlus_Proxy */
 
        /* These static functions are referenced by ALL PyObjectPlus_Proxy types
@@ -561,7 +561,7 @@ public:
        static bool                     m_ignore_deprecation_warnings;
 };
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 PyObject *py_getattr_dict(PyObject *pydict, PyObject *tp_dict);
 #endif
 
index 85db689..dea652d 100644 (file)
@@ -9,8 +9,7 @@ defs = []
 
 if env['WITH_BF_PYTHON']:
     incs += ' ' + env['BF_PYTHON_INC']
-else:
-    defs.append('DISABLE_PYTHON')
+    defs.append('WITH_PYTHON')
 
 if env['WITH_BF_CXX_GUARDEDALLOC']:
     defs.append('WITH_CXX_GUARDEDALLOC')
index d28e435..ef82281 100644 (file)
@@ -39,11 +39,11 @@ public:
        virtual CValue*         CalcFinal(VALUE_DATA_TYPE dtype, VALUE_OPERATOR op, CValue *val);
        virtual void            SetValue(CValue* newval) {      m_strString = newval->GetText(); SetModified(true);     };
        virtual CValue*         GetReplica();
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        virtual PyObject*       ConvertValueToPython() {
                return PyUnicode_FromString(m_strString.Ptr());
        }
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 private:
        // data member
index 1f4f961..262f543 100644 (file)
@@ -29,7 +29,7 @@
 
 double CValue::m_sZeroVec[3] = {0.0,0.0,0.0};
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 PyTypeObject CValue::Type = {
        PyVarObject_HEAD_INIT(NULL, 0)
@@ -60,7 +60,7 @@ PyTypeObject CValue::Type = {
 PyMethodDef CValue::Methods[] = {
        {NULL,NULL} //Sentinel
 };
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 
 /*#define CVALUE_DEBUG*/
@@ -520,7 +520,7 @@ CValue*     CValue::FindIdentifier(const STR_String& identifiername)
        return result;
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 PyAttributeDef CValue::Attributes[] = {
        KX_PYATTRIBUTE_RO_FUNCTION("name",      CValue, pyattr_get_name),
@@ -611,7 +611,7 @@ PyObject*   CValue::ConvertKeysToPython( void )
        return pylist;
 }
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////////
index 009d95e..e6ea431 100644 (file)
@@ -198,7 +198,7 @@ public:
 
 
 #include "PyObjectPlus.h"
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 #include "object.h"
 #endif
 class CValue  : public PyObjectPlus
@@ -221,7 +221,7 @@ public:
        // Construction / Destruction
        CValue();
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        //static PyObject*      PyMake(PyObject*,PyObject*);
        virtual PyObject *py_repr(void)
        {
@@ -237,7 +237,7 @@ public:
        static PyObject * pyattr_get_name(void * self, const KX_PYATTRIBUTE_DEF * attrdef);
        
        virtual PyObject* ConvertKeysToPython( void );
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
        
        
index 57150a9..b346df2 100644 (file)
@@ -87,8 +87,7 @@ ENDIF(WITH_SDL)
 
 IF(WITH_PYTHON)
        LIST(APPEND INC ${PYTHON_INC})
-ELSE(WITH_PYTHON)
-       ADD_DEFINITIONS(-DDISABLE_PYTHON)
+       ADD_DEFINITIONS(-DWITH_PYTHON)
 ENDIF(WITH_PYTHON)
 
 BLENDERLIB(bf_logic "${SRC}" "${INC}")
index f6d24af..3e92172 100644 (file)
@@ -96,7 +96,7 @@ void SCA_2DFilterActuator::SetShaderText(const char *text)
        m_shaderText = text;
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* ------------------------------------------------------------------------- */
 /* Python functions                                                          */
index 53c9be5..7e2c5bd 100644 (file)
@@ -87,7 +87,7 @@ CValue* SCA_ANDController::GetReplica()
        return replica;
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* ------------------------------------------------------------------------- */
 /* Python functions                                                          */
@@ -123,5 +123,5 @@ PyMethodDef SCA_ANDController::Methods[] = {
 PyAttributeDef SCA_ANDController::Attributes[] = {
        { NULL }        //Sentinel
 };
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 /* eof */
index c77e58d..d6c328c 100644 (file)
@@ -110,7 +110,7 @@ void SCA_ActuatorSensor::Update()
        }
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* ------------------------------------------------------------------------- */
 /* Python functions                                                          */
@@ -160,6 +160,6 @@ int SCA_ActuatorSensor::CheckActuator(void *self, const PyAttributeDef*)
        return 1;
 }
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 /* eof */
index 3237468..eb52d36 100644 (file)
@@ -56,7 +56,7 @@ public:
        virtual void    ReParent(SCA_IObject* parent);
        void Update();
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
        /* --------------------------------------------------------------------- */
        /* Python interface ---------------------------------------------------- */
@@ -64,7 +64,7 @@ public:
 
        static int CheckActuator(void *self, const PyAttributeDef*);
        
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 };
 
 #endif
index e364225..88f5855 100644 (file)
@@ -94,7 +94,7 @@ bool SCA_AlwaysSensor::Evaluate()
        return result;
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* ------------------------------------------------------------------------- */
 /* Python functions                                                          */
index 6cad801..abe72fb 100644 (file)
@@ -120,7 +120,7 @@ bool SCA_DelaySensor::Evaluate()
        return trigger;
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* ------------------------------------------------------------------------- */
 /* Python functions                                                          */
@@ -160,6 +160,6 @@ PyAttributeDef SCA_DelaySensor::Attributes[] = {
        { NULL }        //Sentinel
 };
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 /* eof */
index c291ff0..0c6b835 100644 (file)
@@ -194,7 +194,7 @@ void SCA_IController::ApplyState(unsigned int state)
        }
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* Python api */
 
@@ -247,4 +247,4 @@ PyObject* SCA_IController::pyattr_get_actuators(void *self_v, const KX_PYATTRIBU
 {
        return KX_PythonSeq_CreatePyObject((static_cast<SCA_IController*>(self_v))->m_proxy, KX_PYGENSEQ_CONT_TYPE_ACTUATORS);  
 }
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
index e23a0d7..2d19770 100644 (file)
@@ -99,11 +99,11 @@ public:
        }
        
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        static PyObject*        pyattr_get_state(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
        static PyObject*        pyattr_get_sensors(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
        static PyObject*        pyattr_get_actuators(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 };
 
 #endif
index f2e1a8d..afda218 100644 (file)
@@ -169,7 +169,7 @@ CValue* SCA_ILogicBrick::GetEvent()
 
 
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* python stuff */
 
@@ -253,4 +253,4 @@ PyObject* SCA_ILogicBrick::BoolToPyArg(bool boolarg)
        return PyLong_FromSsize_t(boolarg? KX_TRUE: KX_FALSE);  
 }
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
index 3225c24..a444210 100644 (file)
@@ -133,7 +133,7 @@ public:
        virtual void            Replace_IScene(SCA_IScene *val) {};
        virtual void            Replace_NetworkScene(NG_NetworkScene *val) {};
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        // python methods
        
        static PyObject*        pyattr_get_owner(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
@@ -157,7 +157,7 @@ protected:
        /** Convert a a c++ value to KX_TRUE, KX_FALSE in Python. */
        PyObject* BoolToPyArg(bool);
        
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 };
 
index 7c0a5b2..ff71d1b 100644 (file)
@@ -303,7 +303,7 @@ void SCA_IObject::SetState(unsigned int state)
        }
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* ------------------------------------------------------------------------- */
 /* Python functions                                                          */
@@ -342,4 +342,4 @@ PyAttributeDef SCA_IObject::Attributes[] = {
        { NULL }        //Sentinel
 };
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
index 0178da5..591be6f 100644 (file)
@@ -41,7 +41,7 @@ class SCA_ISensor;
 class SCA_IController;
 class SCA_IActuator;
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 template<class T> T PyVecTo(PyObject*);
 #endif
 
index fada698..c655924 100644 (file)
@@ -300,7 +300,7 @@ void SCA_ISensor::Activate(class SCA_LogicManager* logicmgr)
        } 
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* ----------------------------------------------- */
 /* Python Functions                                                       */
@@ -427,6 +427,6 @@ int SCA_ISensor::pyattr_check_tap(void *self_v, const KX_PYATTRIBUTE_DEF *attrde
                self->m_level = false;
        return 0;
 }
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 /* eof */
index 2d3a3ef..f31dd83 100644 (file)
@@ -190,7 +190,7 @@ public:
        bool IsNoLink() const 
                { return !m_links; }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        /* Python functions: */
        KX_PYMETHOD_DOC_NOARGS(SCA_ISensor,reset);
        
@@ -210,7 +210,7 @@ public:
                KX_SENSOR_JUST_DEACTIVATED
        
        };
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 };
 
 #endif //__SCA_ISENSOR
index 29a6a73..a68938e 100644 (file)
@@ -241,7 +241,7 @@ bool SCA_JoystickSensor::isValid(SCA_JoystickSensor::KX_JOYSENSORMODE m)
        return res;
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* ------------------------------------------------------------------------- */
 /* Python functions                                                                                                             */
index 90fb16d..39f826d 100644 (file)
@@ -117,7 +117,7 @@ public:
                return m_joyindex;
        }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
        /* --------------------------------------------------------------------- */
        /* Python interface ---------------------------------------------------- */
@@ -157,7 +157,7 @@ public:
                return 0;
        }
        
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 };
 
index 1a87528..fe4124e 100644 (file)
@@ -408,7 +408,7 @@ void SCA_KeyboardSensor::LogKeystrokes(void)
        }
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* ------------------------------------------------------------------------- */
 /* Python Functions                                                   */
@@ -501,7 +501,7 @@ PyObject* SCA_KeyboardSensor::pyattr_get_events(void *self_v, const KX_PYATTRIBU
        return resultlist;
 }
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 /* Accessed from python */
 
index 5ca329b..0a3b25a 100644 (file)
@@ -103,7 +103,7 @@ public:
        virtual bool IsPositiveTrigger();
        bool    TriggerOnAllKeys();
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        /* --------------------------------------------------------------------- */
        /* Python interface ---------------------------------------------------- */
        /* --------------------------------------------------------------------- */
index d003c56..ab06fe7 100644 (file)
@@ -307,7 +307,7 @@ void SCA_LogicManager::AddTriggeredController(SCA_IController* controller, SCA_I
 {
        controller->Activate(m_triggeredControllerSet);
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
        // so that the controller knows which sensor has activited it
        // only needed for python controller
index 9f4b259..af11353 100644 (file)
@@ -232,7 +232,7 @@ bool SCA_MouseSensor::isValid(SCA_MouseSensor::KX_MOUSESENSORMODE m)
        return ((m > KX_MOUSESENSORMODE_NODEF) && (m < KX_MOUSESENSORMODE_MAX));
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* ------------------------------------------------------------------------- */
 /* Python functions                                                          */
@@ -305,6 +305,6 @@ PyAttributeDef SCA_MouseSensor::Attributes[] = {
        { NULL }        //Sentinel
 };
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 /* eof */
index f52b57a..dc0e9a1 100644 (file)
@@ -104,7 +104,7 @@ class SCA_MouseSensor : public SCA_ISensor
        static void UpdateHotkey(void *self);
 
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        /* --------------------------------------------------------------------- */
        /* Python interface ---------------------------------------------------- */
        /* --------------------------------------------------------------------- */
index c09a53d..bcb2c84 100644 (file)
@@ -87,7 +87,7 @@ CValue* SCA_NANDController::GetReplica()
        return replica;
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* ------------------------------------------------------------------------- */
 /* Python functions                                                          */
index 8ebd79e..5711fb5 100644 (file)
@@ -87,7 +87,7 @@ CValue* SCA_NORController::GetReplica()
        return replica;
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* ------------------------------------------------------------------------- */
 /* Python functions                                                          */
@@ -124,6 +124,6 @@ PyAttributeDef SCA_NORController::Attributes[] = {
        { NULL }        //Sentinel
 };
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 /* eof */
index a638147..72c368d 100644 (file)
@@ -83,7 +83,7 @@ void SCA_ORController::Trigger(SCA_LogicManager* logicmgr)
        }
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* ------------------------------------------------------------------------- */
 /* Python functions                                                          */
@@ -120,6 +120,6 @@ PyAttributeDef SCA_ORController::Attributes[] = {
        { NULL }        //Sentinel
 };
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 /* eof */
index c1b49d3..a5ac565 100644 (file)
@@ -217,7 +217,7 @@ void SCA_PropertyActuator::Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map)
        }
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* ------------------------------------------------------------------------- */
 /* Python functions                                                          */
index be86b97..a32cc50 100644 (file)
@@ -304,7 +304,7 @@ CValue* SCA_PropertySensor::FindIdentifier(const STR_String& identifiername)
        return  GetParent()->FindIdentifier(identifiername);
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* ------------------------------------------------------------------------- */
 /* Python functions                                                          */
@@ -378,6 +378,6 @@ PyAttributeDef SCA_PropertySensor::Attributes[] = {
        { NULL }        //Sentinel
 };
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 /* eof */
index 9a5c476..5a29c52 100644 (file)
@@ -84,7 +84,7 @@ public:
        virtual bool    IsPositiveTrigger();
        virtual CValue*         FindIdentifier(const STR_String& identifiername);
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
        /* --------------------------------------------------------------------- */
        /* Python interface ---------------------------------------------------- */
index 45f0684..109b199 100644 (file)
 #include "SCA_IActuator.h"
 #include "PyObjectPlus.h"
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 #include "compile.h"
 #include "eval.h"
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 #include <algorithm>
 
@@ -49,7 +49,7 @@ SCA_PythonController* SCA_PythonController::m_sCurrentController = NULL;
 
 SCA_PythonController::SCA_PythonController(SCA_IObject* gameobj, int mode)
        : SCA_IController(gameobj),
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        m_bytecode(NULL),
        m_function(NULL),
 #endif
@@ -57,7 +57,7 @@ SCA_PythonController::SCA_PythonController(SCA_IObject* gameobj, int mode)
        m_bModified(true),
        m_debug(false),
        m_mode(mode)
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        , m_pythondictionary(NULL)
 #endif
 
@@ -84,7 +84,7 @@ int                   SCA_PythonController::Release()
 SCA_PythonController::~SCA_PythonController()
 {
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        //printf("released python byte script\n");
        
        Py_XDECREF(m_bytecode);
@@ -104,7 +104,7 @@ CValue* SCA_PythonController::GetReplica()
 {
        SCA_PythonController* replica = new SCA_PythonController(*this);
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        /* why is this needed at all??? - m_bytecode is NULL'd below so this doesnt make sense
         * but removing it crashes blender (with YoFrankie). so leave in for now - Campbell */
        Py_XINCREF(replica->m_bytecode);
@@ -146,7 +146,7 @@ void SCA_PythonController::SetScriptName(const STR_String& name)
 }
 
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 void SCA_PythonController::SetNamespace(PyObject*      pythondictionary)
 {
        if (m_pythondictionary)
@@ -171,7 +171,7 @@ int SCA_PythonController::IsTriggered(class SCA_ISensor* sensor)
        return 0;
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* warning, self is not the SCA_PythonController, its a PyObjectPlus_Proxy */
 PyObject* SCA_PythonController::sPyGetCurrentController(PyObject *self)
@@ -527,13 +527,13 @@ int SCA_PythonController::pyattr_set_script(void *self_v, const KX_PYATTRIBUTE_D
        return PY_SET_ATTR_SUCCESS;
 }
 
-#else // DISABLE_PYTHON
+#else // WITH_PYTHON
 
 void SCA_PythonController::Trigger(SCA_LogicManager* logicmgr)
 {
        /* intentionally blank */
 }
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 /* eof */
index bd78014..602b5e2 100644 (file)
@@ -42,7 +42,7 @@ class SCA_IObject;
 class SCA_PythonController : public SCA_IController
 {
        Py_Header;
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        struct _object *                m_bytecode; /* SCA_PYEXEC_SCRIPT only */
        PyObject*                               m_function; /* SCA_PYEXEC_MODULE only */
 #endif
@@ -55,7 +55,7 @@ class SCA_PythonController : public SCA_IController
  protected:
        STR_String                              m_scriptText;
        STR_String                              m_scriptName;
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        PyObject*                               m_pythondictionary;     /* for SCA_PYEXEC_SCRIPT only */
        PyObject*                               m_pythonfunction;       /* for SCA_PYEXEC_MODULE only */
 #endif
@@ -83,7 +83,7 @@ class SCA_PythonController : public SCA_IController
   
        void    SetScriptText(const STR_String& text);
        void    SetScriptName(const STR_String& name);
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        void    SetNamespace(PyObject*  pythondictionary);
 #endif
        void    SetDebug(bool debug) { m_debug = debug; }
@@ -94,7 +94,7 @@ class SCA_PythonController : public SCA_IController
        bool    Import();
        void    ErrorPrint(const char *error_msg);
        
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        static const char* sPyGetCurrentController__doc__;
        static PyObject* sPyGetCurrentController(PyObject* self);
        static const char* sPyAddActiveActuator__doc__;
index 3d5d356..2134469 100644 (file)
@@ -33,20 +33,20 @@ SCA_PythonKeyboard::SCA_PythonKeyboard(SCA_IInputDevice* keyboard)
 : PyObjectPlus(),
 m_keyboard(keyboard)
 {
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        m_event_dict = PyDict_New();
 #endif
 }
 
 SCA_PythonKeyboard::~SCA_PythonKeyboard()
 {
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        PyDict_Clear(m_event_dict);
        Py_DECREF(m_event_dict);
 #endif
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* ------------------------------------------------------------------------- */
 /* Python functions                                                          */
index 2608351..6a89ba7 100644 (file)
@@ -32,14 +32,14 @@ class SCA_PythonKeyboard : public PyObjectPlus
        Py_Header;
 private:
        class SCA_IInputDevice *m_keyboard;
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        PyObject* m_event_dict;
 #endif
 public:
        SCA_PythonKeyboard(class SCA_IInputDevice* keyboard);
        virtual ~SCA_PythonKeyboard();
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        static PyObject*        pyattr_get_events(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef);
 #endif
 };
index 936ee2f..7267eb7 100644 (file)
@@ -35,20 +35,20 @@ SCA_PythonMouse::SCA_PythonMouse(SCA_IInputDevice* mouse, RAS_ICanvas* canvas)
 m_mouse(mouse),
 m_canvas(canvas)
 {
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        m_event_dict = PyDict_New();
 #endif
 }
 
 SCA_PythonMouse::~SCA_PythonMouse()
 {
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        PyDict_Clear(m_event_dict);
        Py_DECREF(m_event_dict);
 #endif
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* ------------------------------------------------------------------------- */
 /* Python functions                                                          */
index 9e1085e..15a7e19 100644 (file)
@@ -33,7 +33,7 @@ class SCA_PythonMouse : public PyObjectPlus
 private:
        class SCA_IInputDevice *m_mouse;
        class RAS_ICanvas *m_canvas;
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        PyObject* m_event_dict;
 #endif
 public:
@@ -42,7 +42,7 @@ public:
 
        void Show(bool visible);
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        KX_PYMETHOD_DOC(SCA_PythonMouse, show);
 
        static PyObject*        pyattr_get_events(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef);
index 4b90ca7..c3d5988 100644 (file)
@@ -305,7 +305,7 @@ void SCA_RandomActuator::enforceConstraints() {
        }
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* ------------------------------------------------------------------------- */
 /* Python functions                                                          */
index 41d19f5..1fd2180 100644 (file)
@@ -92,7 +92,7 @@ class SCA_RandomActuator : public SCA_IActuator
        virtual CValue* GetReplica();
        virtual void ProcessReplica();
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        
        /* --------------------------------------------------------------------- */
        /* Python interface ---------------------------------------------------- */
@@ -112,7 +112,7 @@ class SCA_RandomActuator : public SCA_IActuator
        KX_PYMETHOD_DOC_VARARGS(SCA_RandomActuator, setFloatNormal);
        KX_PYMETHOD_DOC_VARARGS(SCA_RandomActuator, setFloatNegativeExponential);
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 }; /* end of class KX_EditObjectActuator : public SCA_PropertyActuator */
 
index a7d18ff..8194f1c 100644 (file)
@@ -120,7 +120,7 @@ bool SCA_RandomSensor::Evaluate()
        return evaluateResult;
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* ------------------------------------------------------------------------- */
 /* Python functions                                                          */
@@ -176,6 +176,6 @@ int SCA_RandomSensor::pyattr_set_seed(void *self_v, const KX_PYATTRIBUTE_DEF *at
        return PY_SET_ATTR_SUCCESS;
 }
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 /* eof */
index 3be1794..af5a767 100644 (file)
@@ -56,7 +56,7 @@ public:
        virtual bool IsPositiveTrigger();
        virtual void Init();
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
        /* --------------------------------------------------------------------- */
        /* Python interface ---------------------------------------------------- */
index 9f54e41..f1f76c8 100644 (file)
@@ -91,7 +91,7 @@ CValue* SCA_XNORController::GetReplica()
        return replica;
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* ------------------------------------------------------------------------- */
 /* Python functions                                                          */
@@ -128,6 +128,6 @@ PyAttributeDef SCA_XNORController::Attributes[] = {
        { NULL }        //Sentinel
 };
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 /* eof */
index a58f30a..ee63b72 100644 (file)
@@ -91,7 +91,7 @@ CValue* SCA_XORController::GetReplica()
        return replica;
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* ------------------------------------------------------------------------- */
 /* Python functions                                                          */
@@ -127,6 +127,6 @@ PyMethodDef SCA_XORController::Methods[] = {
 PyAttributeDef SCA_XORController::Attributes[] = {
        { NULL }        //Sentinel
 };
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 /* eof */
index c9d1fed..04990e1 100644 (file)
@@ -16,8 +16,7 @@ else:
 
 if env['WITH_BF_PYTHON']:
     incs += ' ' + env['BF_PYTHON_INC']
-else:
-    defs.append('DISABLE_PYTHON')
+    defs.append('WITH_PYTHON')
 
 if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
     if env['BF_DEBUG']:
index 7a16e95..60cb437 100644 (file)
@@ -62,8 +62,7 @@ defs = [ 'GLEW_STATIC' ]
 
 if env['WITH_BF_PYTHON']:
     incs += Split(env['BF_PYTHON_INC'])
-else:
-    defs.append('DISABLE_PYTHON')
+    defs.append('WITH_PYTHON')
 
 incs += Split(env['BF_PNG_INC'])
 incs += Split(env['BF_ZLIB_INC'])
index d1b8fb1..506601f 100644 (file)
@@ -677,11 +677,11 @@ bool GPG_Application::startEngine(void)
                        m_startScene,
                        m_canvas);
                
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
                        // some python things
                        PyObject *gameLogic, *gameLogic_keys;
                        setupGamePython(m_ketsjiengine, startscene, m_maggie, NULL, &gameLogic, &gameLogic_keys, m_argc, m_argv);
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
                //initialize Dome Settings
                if(m_startScene->gm.stereoflag == STEREO_DOME)
index 41520a0..d222488 100644 (file)
@@ -44,8 +44,7 @@ defs = [ 'GLEW_STATIC' ]
 
 if env['WITH_BF_PYTHON']:
     incs += Split(env['BF_PYTHON_INC'])
-else:
-    defs.append('DISABLE_PYTHON')
+    defs.append('WITH_PYTHON')
 
 if env['WITH_BF_FFMPEG']:
     defs.append('WITH_FFMPEG')
index 8edefe7..b00c1b7 100644 (file)
@@ -728,7 +728,7 @@ void BL_Shader::SetUniform(int uniform, const int* val, int len)
        }
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 PyMethodDef BL_Shader::Methods[] = 
 {
@@ -1411,6 +1411,6 @@ KX_PYMETHODDEF_DOC( BL_Shader, setUniformDef, "setUniformDef(name, enum)" )
        return NULL;
 }
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 // eof
index 5108ace..77c642e 100644 (file)
@@ -222,7 +222,7 @@ public:
        void SetUniform(int uniform, const int val);
 
        // Python interface
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        virtual PyObject* py_repr(void) { return PyUnicode_FromFormat("BL_Shader\n\tvertex shader:%s\n\n\tfragment shader%s\n\n", vertProg, fragProg); }
 
        // -----------------------------------
index 2813160..1ca71e6 100644 (file)
@@ -134,8 +134,7 @@ ENDIF(WITH_SDL)
 
 IF(WITH_PYTHON)
        LIST(APPEND INC ${PYTHON_INC})
-ELSE(WITH_PYTHON)
-       ADD_DEFINITIONS(-DDISABLE_PYTHON)
+       ADD_DEFINITIONS(-DWITH_PYTHON)
 ENDIF(WITH_PYTHON)
 
 IF(WITH_FFMPEG)
index 2b1c1a6..5099534 100644 (file)
@@ -46,8 +46,7 @@ SET(SRC
 
 IF(WITH_PYTHON)
        LIST(APPEND INC ${PYTHON_INC})
-ELSE(WITH_PYTHON)
-       ADD_DEFINITIONS(-DDISABLE_PYTHON)
+       ADD_DEFINITIONS(-DWITH_PYTHON)
 ENDIF(WITH_PYTHON)
 
 BLENDERLIB(kx_network "${SRC}" "${INC}")
index e047a9a..0f563dc 100644 (file)
@@ -91,7 +91,7 @@ CValue* KX_NetworkMessageActuator::GetReplica()
        return replica;
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* -------------------------------------------------------------------- */
 /* Python interface --------------------------------------------------- */
@@ -132,4 +132,4 @@ PyAttributeDef KX_NetworkMessageActuator::Attributes[] = {
        { NULL }        //Sentinel
 };
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
index 56ccac9..91b0599 100644 (file)
@@ -154,7 +154,7 @@ bool KX_NetworkMessageSensor::IsPositiveTrigger()
        return m_IsUp;
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* --------------------------------------------------------------------- */
 /* Python interface ---------------------------------------------------- */
@@ -215,4 +215,4 @@ PyObject* KX_NetworkMessageSensor::pyattr_get_subjects(void *self_v, const KX_PY
        }
 }
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
index 1efd25d..8f5a114 100644 (file)
@@ -71,7 +71,7 @@ public:
                m_NetworkScene= val;
        };
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
        /* ------------------------------------------------------------- */
        /* Python interface -------------------------------------------- */
@@ -81,7 +81,7 @@ public:
        static PyObject*        pyattr_get_bodies(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef);     
        static PyObject*        pyattr_get_subjects(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef);
 
-#endif //  DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 };
 
index e7f98ff..78cdc8d 100644 (file)
@@ -11,7 +11,6 @@ defs = []
 
 if env['WITH_BF_PYTHON']:
     incs += ' ' + env['BF_PYTHON_INC']
-else:
-    defs.append('DISABLE_PYTHON')
+    defs.append('WITH_PYTHON')
 
 env.BlenderLib ( 'bf_network', Split(sources), Split(incs), defines=defs,libtype=['core','player'], priority=[400,125], cxx_compileflags=env['BGE_CXXFLAGS'])
index a47a197..732c0b9 100644 (file)
@@ -149,7 +149,7 @@ bool KX_ArmatureSensor::Evaluate()
        return (reset) ? true : false;
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* ------------------------------------------------------------------------- */
 /* Python functions                                                          */
@@ -201,4 +201,4 @@ PyObject* KX_ArmatureSensor::pyattr_get_constraint(void *self, const struct KX_P
        Py_RETURN_NONE;
 }
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
index 636309f..b007899 100644 (file)
@@ -66,14 +66,14 @@ public:
        // identify the constraint that this actuator controls
        void FindConstraint();
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
        /* --------------------------------------------------------------------- */
        /* Python interface ---------------------------------------------------- */
        /* --------------------------------------------------------------------- */
        static PyObject* pyattr_get_constraint(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 private:
        struct bConstraint*     m_constraint;
index d88997e..a4dc68b 100644 (file)
@@ -783,7 +783,7 @@ void KX_BlenderMaterial::SetBlenderGLSLShader(int layer)
        }
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 PyMethodDef KX_BlenderMaterial::Methods[] = 
 {
@@ -967,4 +967,4 @@ KX_PYMETHODDEF_DOC( KX_BlenderMaterial, setBlending , "setBlending( bge.logic.sr
        return NULL;
 }
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
index 239e334..745045f 100644 (file)
@@ -98,7 +98,7 @@ public:
                }
        };
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        // --------------------------------
        virtual PyObject* py_repr(void) { return PyUnicode_FromString(mMaterial->matname.ReadPtr()); }
 
@@ -113,7 +113,7 @@ public:
        KX_PYMETHOD_DOC( KX_BlenderMaterial, setTexture );
 
        KX_PYMETHOD_DOC( KX_BlenderMaterial, setBlending );
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
        // --------------------------------
        // pre calculate to avoid pops/lag at startup
index 2402baf..46a9236 100644 (file)
@@ -474,7 +474,7 @@ int KX_Camera::GetViewportTop() const
        return m_camdata.m_viewporttop;
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 //----------------------------------------------------------------------------
 //Python
 
index ad2460d..130dfd4 100644 (file)
@@ -41,7 +41,7 @@
 #include "IntValue.h"
 #include "RAS_CameraData.h"
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 /* utility conversion function */
 bool ConvertPythonToCamera(PyObject * value, KX_Camera **object, bool py_none_ok, const char *error_prefix);
 #endif
@@ -269,7 +269,7 @@ public:
 
        virtual int GetGameObjectType() { return OBJ_CAMERA; }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        KX_PYMETHOD_DOC_VARARGS(KX_Camera, sphereInsideFrustum);
        KX_PYMETHOD_DOC_O(KX_Camera, boxInsideFrustum);
        KX_PYMETHOD_DOC_O(KX_Camera, pointInsideFrustum);
index bc67ecb..18d3e04 100644 (file)
@@ -346,7 +346,7 @@ CValue *KX_CameraActuator::findObject(char *obName)
        return NULL;
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* ------------------------------------------------------------------------- */
 /* Python functions                                                          */
@@ -414,6 +414,6 @@ int KX_CameraActuator::pyattr_set_object(void *self_v, const KX_PYATTRIBUTE_DEF
        return PY_SET_ATTR_SUCCESS;
 }
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 /* eof */
index 2bc0ee1..0a0a47f 100644 (file)
@@ -114,7 +114,7 @@ private :
        /** Methods inherited from SCA_ILogicBrick */
        virtual void    Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map);
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
        /* --------------------------------------------------------------------- */
        /* Python interface ---------------------------------------------------- */
@@ -124,7 +124,7 @@ private :
        static PyObject*        pyattr_get_object(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
        static int                      pyattr_set_object(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 };
 
index 9380f4b..15a4a46 100644 (file)
@@ -557,7 +557,7 @@ bool KX_ConstraintActuator::IsValidMode(KX_ConstraintActuator::KX_CONSTRAINTTYPE
        return res;
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* ------------------------------------------------------------------------- */
 /* Python functions                                                          */
index b1baa5f..2882ca5 100644 (file)
@@ -45,7 +45,7 @@ KX_ConstraintWrapper::~KX_ConstraintWrapper()
 {
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 PyObject* KX_ConstraintWrapper::PyGetConstraintId()
 {
@@ -120,4 +120,4 @@ PyObject* KX_ConstraintWrapper::pyattr_get_constraintId(void *self_v, const KX_P
        return self->PyGetConstraintId();
 }
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
index db9543c..58c204d 100644 (file)
@@ -40,7 +40,7 @@ public:
        virtual ~KX_ConstraintWrapper ();
        int                     getConstraintId() { return m_constraintId;};
        
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        KX_PYMETHOD_NOARGS(KX_ConstraintWrapper,GetConstraintId);
        KX_PYMETHOD(KX_ConstraintWrapper,SetParam);
        KX_PYMETHOD(KX_ConstraintWrapper,GetParam);
index 64ef06a..36fc02a 100644 (file)
@@ -24,7 +24,7 @@ Developed as part of a Research and Development project for SAT - La Société d
 
 #include "KX_Dome.h"
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 #include <structmember.h>
 #endif
 
index 208c526..1a19591 100644 (file)
@@ -124,7 +124,7 @@ bool KX_GameActuator::Update()
                }
        case KX_GAME_SAVECFG:
                {
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
                        if (m_ketsjiengine)
                        {
                                char mashal_path[512];
@@ -152,11 +152,11 @@ bool KX_GameActuator::Update()
                                        delete [] marshal_buffer;
                        }
                        break;
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
                }
        case KX_GAME_LOADCFG:
                {
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
                        if (m_ketsjiengine)
                        {
                                char mashal_path[512];
@@ -191,7 +191,7 @@ bool KX_GameActuator::Update()
                                }
                        }
                        break;
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
                }
        default:
                ; /* do nothing? this is an internal error !!! */
@@ -201,7 +201,7 @@ bool KX_GameActuator::Update()
 }
 
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* ------------------------------------------------------------------------- */
 /* Python functions                                                          */
@@ -241,4 +241,4 @@ PyAttributeDef KX_GameActuator::Attributes[] = {
        { NULL }        //Sentinel
 };
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
index bbb17cd..6b1c36a 100644 (file)
@@ -102,7 +102,7 @@ KX_GameObject::KX_GameObject(
        m_xray(false),
        m_pHitObject(NULL),
        m_isDeformable(false)
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        , m_attr_dict(NULL)
 #endif
 {
@@ -148,12 +148,12 @@ KX_GameObject::~KX_GameObject()
        {
                delete m_pGraphicController;
        }
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        if (m_attr_dict) {
                PyDict_Clear(m_attr_dict); /* incase of circular refs or other weired cases */
                Py_DECREF(m_attr_dict);
        }
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 }
 
 KX_GameObject* KX_GameObject::GetClientObject(KX_ClientObjectInfo* info)
@@ -348,7 +348,7 @@ void KX_GameObject::ProcessReplica()
        m_pClient_info->m_gameobject = this;
        m_state = 0;
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        if(m_attr_dict)
                m_attr_dict= PyDict_Copy(m_attr_dict);
 #endif
@@ -1448,7 +1448,7 @@ void KX_GameObject_Mathutils_Callback_Init(void)
 
 #endif // USE_MATHUTILS
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 /* ------- python stuff ---------------------------------------------------*/
 PyMethodDef KX_GameObject::Methods[] = {
        {"applyForce", (PyCFunction)    KX_GameObject::sPyApplyForce, METH_VARARGS},
@@ -3053,4 +3053,4 @@ bool ConvertPythonToGameObject(PyObject * value, KX_GameObject **object, bool py
        
        return false;
 }
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
index 14587d2..640816e 100644 (file)
@@ -60,7 +60,7 @@ class PHY_IGraphicController;
 class PHY_IPhysicsEnvironment;
 struct Object;
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 /* utility conversion function */
 bool ConvertPythonToGameObject(PyObject * value, KX_GameObject **object, bool py_none_ok, const char *error_prefix);
 #endif
@@ -116,7 +116,7 @@ public:
         */
        static KX_GameObject* GetClientObject(KX_ClientObjectInfo* info);
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        // Python attributes that wont convert into CValue
        // 
        // there are 2 places attributes can be stored, in the CValue,
@@ -796,7 +796,7 @@ public:
        CListValue* GetChildren();
        CListValue* GetChildrenRecursive();
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        /**
         * @section Python interface functions.
         */
index eca40ca..605aea5 100644 (file)
@@ -400,7 +400,7 @@ int KX_IpoActuator::string2mode(char* modename) {
        return res;
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* ------------------------------------------------------------------------- */
 /* Python functions                                                          */
@@ -448,6 +448,6 @@ PyAttributeDef KX_IpoActuator::Attributes[] = {
        { NULL }        //Sentinel
 };
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 /* eof */
index 4f3b6e5..a1c7957 100644 (file)
@@ -112,7 +112,7 @@ KX_KetsjiEngine::KX_KetsjiEngine(KX_ISystem* system)
        m_rendertools(NULL),
        m_sceneconverter(NULL),
        m_networkdevice(NULL),
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        m_pythondictionary(NULL),
 #endif
        m_keyboarddevice(NULL),
@@ -233,7 +233,7 @@ void KX_KetsjiEngine::SetRasterizer(RAS_IRasterizer* rasterizer)
        m_rasterizer = rasterizer;
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 /*
  * At the moment the bge.logic module is imported into 'pythondictionary' after this function is called.
  * if this function ever changes to assign a copy, make sure the game logic module is imported into this dictionary before hand.
@@ -370,7 +370,7 @@ void KX_KetsjiEngine::RenderDome()
        }
        m_dome->Draw();
        // Draw Callback for the last scene
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        scene->RunDrawingCallbacks(scene->GetPostDrawCB());
 #endif 
        EndFrame();
@@ -612,7 +612,7 @@ else
                                m_logger->StartLog(tc_physics, m_kxsystem->GetTimeInSeconds(), true);
                                SG_SetActiveStage(SG_STAGE_PHYSICS1);
                                // set Python hooks for each scene
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
                                PHY_SetActiveEnvironment(scene->GetPhysicsEnvironment());
 #endif
                                KX_SetActiveScene(scene);
@@ -716,7 +716,7 @@ else
                                m_suspendeddelta = scene->getSuspendedDelta();
                                
                                // set Python hooks for each scene
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
                                PHY_SetActiveEnvironment(scene->GetPhysicsEnvironment());
 #endif
                                KX_SetActiveScene(scene);
@@ -1287,7 +1287,7 @@ void KX_KetsjiEngine::RenderFrame(KX_Scene* scene, KX_Camera* cam)
        m_logger->StartLog(tc_rasterizer, m_kxsystem->GetTimeInSeconds(), true);
        SG_SetActiveStage(SG_STAGE_RENDER);
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        // Run any pre-drawing python callbacks
        scene->RunDrawingCallbacks(scene->GetPreDrawCB());
 #endif
@@ -1304,7 +1304,7 @@ void KX_KetsjiEngine::PostRenderScene(KX_Scene* scene)
 {
        m_rendertools->MotionBlur(m_rasterizer);
        scene->Render2DFilters(m_canvas);
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        scene->RunDrawingCallbacks(scene->GetPostDrawCB());     
 #endif
        m_rasterizer->FlushDebugLines();
index f52ec81..4ce14e1 100644 (file)
@@ -70,7 +70,7 @@ private:
        class RAS_IRenderTools*                         m_rendertools;
        class KX_ISceneConverter*                       m_sceneconverter;
        class NG_NetworkDeviceInterface*                m_networkdevice;
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        /* borrowed from sys.modules["__main__"], dont manage ref's */
        PyObject*                                       m_pythondictionary;
 #endif
@@ -204,7 +204,7 @@ public:
        void                    SetCanvas(RAS_ICanvas* canvas);
        void                    SetRenderTools(RAS_IRenderTools* rendertools);
        void                    SetRasterizer(RAS_IRasterizer* rasterizer);
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        void                    SetPyNamespace(PyObject* pythondictionary);
        PyObject*               GetPyNamespace(){return m_pythondictionary;};
 #endif
index fdd325c..b608be4 100644 (file)
@@ -259,7 +259,7 @@ void KX_LightObject::UnbindShadowBuffer(RAS_IRasterizer *ras)
        GPU_lamp_shadow_buffer_unbind(lamp);
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 /* ------------------------------------------------------------------------- */
 /* Python Integration Hooks                                                                     */
 /* ------------------------------------------------------------------------- */
@@ -385,4 +385,4 @@ int KX_LightObject::pyattr_set_type(void* self_v, const KX_PYATTRIBUTE_DEF *attr
 
        return PY_SET_ATTR_SUCCESS;
 }
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
index 334aed1..f7b40d2 100644 (file)
@@ -69,7 +69,7 @@ public:
 
        virtual int GetGameObjectType() { return OBJ_LIGHT; }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        /* attributes */
        static PyObject*        pyattr_get_color(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef);
        static int                      pyattr_set_color(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject* value);
index a5ff7eb..3cedda3 100644 (file)
@@ -26,7 +26,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 #include "KX_MeshProxy.h"
 #include "RAS_IPolygonMaterial.h"
@@ -308,4 +308,4 @@ bool ConvertPythonToMesh(PyObject * value, RAS_MeshObject **object, bool py_none
        return false;
 }
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
index 7b62704..2923149 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef __KX_MESHPROXY
 #define __KX_MESHPROXY
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 #include "SCA_IObject.h"
 
@@ -74,7 +74,7 @@ public:
        static PyObject * pyattr_get_numPolygons(void * self, const KX_PYATTRIBUTE_DEF * attrdef);
 };
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 #endif //__KX_MESHPROXY
 
index 19114c8..6372105 100644 (file)
@@ -347,7 +347,7 @@ const MT_Vector2& KX_MouseFocusSensor::HitUV() const
        return m_hitUV;
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* ------------------------------------------------------------------------- */
 /* Python functions                                                          */
@@ -442,7 +442,7 @@ PyObject* KX_MouseFocusSensor::pyattr_get_hit_uv(void *self_v, const KX_PYATTRIB
        return PyObjectFrom(self->HitUV());
 }
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 /* eof */
 
index c969aa3..3ea0f93 100644 (file)
@@ -94,7 +94,7 @@ class KX_MouseFocusSensor : public SCA_MouseSensor
        const MT_Vector3& HitNormal() const;
        const MT_Vector2& HitUV() const;
        
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
        /* --------------------------------------------------------------------- */
        /* Python interface ---------------------------------------------------- */
@@ -109,7 +109,7 @@ class KX_MouseFocusSensor : public SCA_MouseSensor
        static PyObject*        pyattr_get_hit_normal(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef);
        static PyObject*        pyattr_get_hit_uv(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef);
                
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
        /* --------------------------------------------------------------------- */
        SCA_IObject*    m_hitObject;
index 36c1b0f..c9af5d8 100644 (file)
@@ -242,7 +242,7 @@ bool        KX_NearSensor::NewHandleCollision(void* obj1,void* obj2,const PHY_CollData
        return false; // was DT_CONTINUE; but this was defined in Sumo as false
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* ------------------------------------------------------------------------- */
 /* Python Functions                                                                                                                     */
@@ -285,4 +285,4 @@ PyAttributeDef KX_NearSensor::Attributes[] = {
        {NULL} //Sentinel
 };
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
index 10dba22..67f235c 100644 (file)
@@ -78,7 +78,7 @@ public:
        virtual bool    BroadPhaseSensorFilterCollision(void*obj1,void*obj2) { return false; };
        virtual sensortype GetSensorType() { return ST_NEAR; }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
        /* --------------------------------------------------------------------- */
        /* Python interface ---------------------------------------------------- */
@@ -99,7 +99,7 @@ public:
                return 0;
        }
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 };
 
index 0d0cac3..9f1df32 100644 (file)
@@ -313,7 +313,7 @@ bool KX_ObjectActuator::isValid(KX_ObjectActuator::KX_OBJECT_ACT_VEC_TYPE type)
        return res;
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* ------------------------------------------------------------------------- */
 /* Python functions                                                          */
@@ -636,6 +636,6 @@ int KX_ObjectActuator::pyattr_set_reference(void *self, const struct KX_PYATTRIB
        return PY_SET_ATTR_SUCCESS;
 }
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 /* eof */
index b12cf77..9dab1e3 100644 (file)
@@ -157,7 +157,7 @@ public:
                }
        virtual bool Update();
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
        /* --------------------------------------------------------------------- */
        /* Python interface ---------------------------------------------------- */
@@ -217,7 +217,7 @@ public:
                return 0;
        }
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 };
 
index 6274058..b41d48f 100644 (file)
@@ -130,7 +130,7 @@ bool KX_ParentActuator::Update()
        return false;
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* ------------------------------------------------------------------------- */
 /* Python functions                                                          */
@@ -199,6 +199,6 @@ int KX_ParentActuator::pyattr_set_object(void *self, const struct KX_PYATTRIBUTE
        return PY_SET_ATTR_SUCCESS;
 }
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 /* eof */
index 884b182..28745c6 100644 (file)
@@ -77,7 +77,7 @@ class KX_ParentActuator : public SCA_IActuator
        virtual void Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map);
        virtual bool UnlinkObject(SCA_IObject* clientobj);
        
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
        /* --------------------------------------------------------------------- */
        /* Python interface ---------------------------------------------------- */
@@ -87,7 +87,7 @@ class KX_ParentActuator : public SCA_IActuator
        static PyObject* pyattr_get_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
        static int pyattr_set_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
        
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 }; /* end of class KX_ParentActuator : public SCA_PropertyActuator */
 
index 15fc3e5..4717748 100644 (file)
@@ -46,7 +46,7 @@ KX_PhysicsObjectWrapper::~KX_PhysicsObjectWrapper()
 {
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 PyObject* KX_PhysicsObjectWrapper::PySetPosition(PyObject* args)
 {
index 01980c0..ca7e993 100644 (file)
@@ -39,14 +39,14 @@ public:
        KX_PhysicsObjectWrapper(class PHY_IPhysicsController* ctrl,class PHY_IPhysicsEnvironment* physenv);
        virtual ~KX_PhysicsObjectWrapper();
        
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
        KX_PYMETHOD_VARARGS(KX_PhysicsObjectWrapper,SetPosition);
        KX_PYMETHOD_VARARGS(KX_PhysicsObjectWrapper,SetLinearVelocity);
        KX_PYMETHOD_VARARGS(KX_PhysicsObjectWrapper,SetAngularVelocity);
        KX_PYMETHOD_VARARGS(KX_PhysicsObjectWrapper,SetActive);
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 private:
        class PHY_IPhysicsController*   m_ctrl;
index 9395e57..9843d93 100644 (file)
@@ -26,7 +26,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 #include "KX_PolyProxy.h"
 #include "KX_MeshProxy.h"
@@ -267,4 +267,4 @@ KX_PYMETHODDEF_DOC_NOARGS(KX_PolyProxy, getMaterial,
        }
 }
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
index 3e66963..179fb67 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef __KX_POLYROXY
 #define __KX_POLYPROXY
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 #include "SCA_IObject.h"
 
@@ -77,7 +77,7 @@ public:
 
 };
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 #endif //__KX_POLYPROXY
 
index 63204b1..8988984 100644 (file)
@@ -54,7 +54,7 @@ KX_PolygonMaterial::KX_PolygonMaterial()
        m_tface(NULL),
        m_mcol(NULL),
        m_material(NULL),
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        m_pymaterial(NULL),
 #endif
        m_pass(0)
@@ -90,7 +90,7 @@ void KX_PolygonMaterial::Initialize(
        m_tface = tface;
        m_mcol = mcol;
        m_material = ma;
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        m_pymaterial = 0;
 #endif
        m_pass = 0;
@@ -98,19 +98,19 @@ void KX_PolygonMaterial::Initialize(
 
 KX_PolygonMaterial::~KX_PolygonMaterial()
 {
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        if (m_pymaterial)
        {
                Py_DECREF(m_pymaterial);
        }
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 }
 
 bool KX_PolygonMaterial::Activate(RAS_IRasterizer* rasty, TCachingInfo& cachingInfo) const 
 {
        bool dopass = false;
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        if (m_pymaterial)
        {
                PyObject *pyRasty = PyCObject_FromVoidPtr((void*)rasty, NULL);  /* new reference */
@@ -130,7 +130,7 @@ bool KX_PolygonMaterial::Activate(RAS_IRasterizer* rasty, TCachingInfo& cachingI
                }
        }
        else
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
        {
                switch (m_pass++)
                {
@@ -201,7 +201,7 @@ void KX_PolygonMaterial::GetMaterialRGBAColor(unsigned char *rgba) const
                RAS_IPolyMaterial::GetMaterialRGBAColor(rgba);
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 //----------------------------------------------------------------------------
 //Python
@@ -393,4 +393,4 @@ int KX_PolygonMaterial::pyattr_set_specular(void *self_v, const KX_PYATTRIBUTE_D
        return PY_SET_ATTR_SUCCESS;
 }
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
index 03b4bf1..17adbac 100644 (file)
@@ -58,7 +58,7 @@ private:
        unsigned int*   m_mcol;
        Material*               m_material;
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        PyObject*               m_pymaterial;
 #endif
 
@@ -122,7 +122,7 @@ public:
        }
        virtual void GetMaterialRGBAColor(unsigned char *rgba) const;
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        KX_PYMETHOD_DOC(KX_PolygonMaterial, updateTexture);
        KX_PYMETHOD_DOC(KX_PolygonMaterial, setTexture);
        KX_PYMETHOD_DOC(KX_PolygonMaterial, activate);
index bbf8152..d2cb9ae 100644 (file)
@@ -37,7 +37,7 @@
 
 #include "PyObjectPlus.h" 
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 // nasty glob variable to connect scripting language
 // if there is a better way (without global), please do so!
@@ -659,5 +659,5 @@ PHY_IPhysicsEnvironment*    PHY_GetActiveEnvironment()
        return g_CurrentActivePhysicsEnvironment;
 }
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
index a1b3c3d..6da6079 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef PHY_PYTHON_CONSTRAINTBINDING
 #define PHY_PYTHON_CONSTRAINTBINDING
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 #include <Python.h>
 
@@ -37,7 +37,7 @@ PyObject*                             initPythonConstraintBinding();
 void   PHY_RemovePythonConstraintBinding();
 void   PHY_SetActiveEnvironment(class  PHY_IPhysicsEnvironment* env);
 PHY_IPhysicsEnvironment*       PHY_GetActiveEnvironment();
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 #endif //PHY_PYTHON_CONSTRAINTBINDING
 
index 12f8833..45957ca 100644 (file)
@@ -32,7 +32,7 @@
 #pragma warning (disable : 4786)
 #endif //WIN32
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 #include "MT_Vector3.h"
 #include "MT_Vector4.h"
@@ -190,4 +190,4 @@ PyObject* PyObjectFrom(const MT_Tuple2 &vec)
 #endif
 }
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
index 9c9688f..589bd72 100644 (file)
@@ -42,7 +42,7 @@
 #include "KX_Python.h"
 #include "PyObjectPlus.h"
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 #ifdef USE_MATHUTILS
 extern "C" {
 #include "../../blender/python/generic/mathutils.h" /* so we can have mathutils callbacks */
@@ -239,4 +239,4 @@ PyObject* PyObjectFrom(const MT_Tuple4 &pos);
 
 #endif
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
index 42c3771..99870c4 100644 (file)
@@ -34,7 +34,7 @@
 #pragma warning (disable : 4786)
 #endif //WIN32
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 #ifdef _POSIX_C_SOURCE
 #undef _POSIX_C_SOURCE
@@ -56,7 +56,6 @@ extern "C" {
        #include "marshal.h" /* python header for loading/saving dicts */
 }
 
-#define WITH_PYTHON
 #include "AUD_PyInit.h"
 
 #endif
@@ -139,7 +138,7 @@ extern "C" {
 
 // 'local' copy of canvas ptr, for window height/width python scripts
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 static RAS_ICanvas* gp_Canvas = NULL;
 static char gp_GamePythonPath[FILE_MAXDIR + FILE_MAXFILE] = "";
@@ -147,7 +146,7 @@ static char gp_GamePythonPathOrig[FILE_MAXDIR + FILE_MAXFILE] = ""; // not super
 
 static SCA_PythonKeyboard* gp_PythonKeyboard = NULL;
 static SCA_PythonMouse* gp_PythonMouse = NULL;
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 static KX_Scene*       gp_KetsjiScene = NULL;
 static KX_KetsjiEngine*        gp_KetsjiEngine = NULL;
@@ -176,7 +175,7 @@ void        KX_RasterizerDrawDebugLine(const MT_Vector3& from,const MT_Vector3& to,cons
                gp_Rasterizer->DrawDebugLine(from,to,color);
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 static PyObject *gp_OrigPythonSysPath= NULL;
 static PyObject *gp_OrigPythonSysModules= NULL;
@@ -2452,4 +2451,4 @@ void resetGamePythonPath()
        gp_GamePythonPathOrig[0] = '\0';
 }
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
index fb59a2f..7b0ed08 100644 (file)
@@ -39,7 +39,7 @@ typedef enum {
 
 extern bool gUseVisibilityTemp;
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 PyObject*      initGameLogic(class KX_KetsjiEngine *engine, class KX_Scene* ketsjiscene);
 PyObject*      initGameKeys();
 PyObject*      initRasterizer(class RAS_IRasterizer* rasty,class RAS_ICanvas* canvas);
index 6b9d7a2..3cca4f3 100644 (file)
@@ -32,7 +32,7 @@
 #ifndef _adr_py_init_types_h_                          // only process once,
 #define _adr_py_init_types_h_                          // even if multiply included
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* Only for Class::Parents */
 #include "BL_BlenderShader.h"
@@ -256,6 +256,6 @@ void initPyTypes(void)
 #endif
 }
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 #endif
index c16fafe..1053f32 100644 (file)
@@ -30,7 +30,7 @@
 #ifndef _adr_py_init_types_h_                          // only process once,
 #define _adr_py_init_types_h_                          // even if multiply included
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 void initPyTypes(void);
 #endif
 
index 5c87fe2..bed3f33 100644 (file)
@@ -28,7 +28,7 @@
  * Readonly sequence wrapper for lookups on logic bricks
  */
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 #include "KX_PythonSeq.h"
 #include "KX_GameObject.h"
@@ -512,4 +512,4 @@ PyTypeObject KX_PythonSeq_Type = {
        NULL
 };
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
index ca8f667..7ca36cc 100644 (file)
@@ -31,7 +31,7 @@
 #ifndef _adr_py_seq_h_                         // only process once,
 #define _adr_py_seq_h_                         // even if multiply included
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 #include "PyObjectPlus.h"
 
@@ -61,6 +61,6 @@ typedef struct {
 
 PyObject *KX_PythonSeq_CreatePyObject(PyObject *base, short type);
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 #endif // _adr_py_seq_h_
index 0415591..60dc3be 100644 (file)
@@ -172,7 +172,7 @@ void KX_RadarSensor::SynchronizeTransform()
 /* Python Functions                                                                                                                     */
 /* ------------------------------------------------------------------------- */
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* ------------------------------------------------------------------------- */
 /* Python Integration Hooks                                                  */
@@ -212,4 +212,4 @@ PyAttributeDef KX_RadarSensor::Attributes[] = {
        {NULL} //Sentinel
 };
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
index e745d1f..001c7a2 100644 (file)
@@ -309,7 +309,7 @@ bool KX_RaySensor::Evaluate()
        return result;
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* ------------------------------------------------------------------------- */
 /* Python functions                                                          */
@@ -365,4 +365,4 @@ PyObject* KX_RaySensor::pyattr_get_hitobject(void *self_v, const KX_PYATTRIBUTE_
        Py_RETURN_NONE;
 }
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
index 34f7d8a..ac0b5eb 100644 (file)
@@ -90,12 +90,12 @@ public:
                KX_RAY_AXIS_NEG_Z
        };
        
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
        /* Attributes */
        static PyObject* pyattr_get_hitobject(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef);
        
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 };
 
index eee6146..34b4904 100644 (file)
@@ -159,7 +159,7 @@ void KX_SCA_AddObjectActuator::Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map)
        }
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* ------------------------------------------------------------------------- */
 /* Python functions                                                          */
@@ -246,7 +246,7 @@ PyObject* KX_SCA_AddObjectActuator::PyInstantAddObject()
        Py_RETURN_NONE;
 }
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 void   KX_SCA_AddObjectActuator::InstantAddObject()
 {
index c2068d1..16612f9 100644 (file)
@@ -122,7 +122,7 @@ public:
 
        void    InstantAddObject();
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
        KX_PYMETHOD_DOC_NOARGS(KX_SCA_AddObjectActuator,InstantAddObject);
 
@@ -130,7 +130,7 @@ public:
        static int pyattr_set_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
        static PyObject* pyattr_get_objectLastCreated(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
        
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 }; /* end of class KX_SCA_AddObjectActuator : public KX_EditObjectActuator */
 
index bc59c63..6e36bde 100644 (file)
@@ -37,7 +37,7 @@
 
 #include "KX_SCA_DynamicActuator.h"
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* ------------------------------------------------------------------------- */
 /* Python functions                                                          */
@@ -77,7 +77,7 @@ PyAttributeDef KX_SCA_DynamicActuator::Attributes[] = {
        { NULL }        //Sentinel
 };
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 /* ------------------------------------------------------------------------- */
 /* Native functions                                                          */
index c9ead72..f50dc9f 100644 (file)
@@ -80,7 +80,7 @@ CValue* KX_SCA_EndObjectActuator::GetReplica()
        return replica;
 };
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* ------------------------------------------------------------------------- */
 /* Python functions : integration hooks                                      */
@@ -116,6 +116,6 @@ PyAttributeDef KX_SCA_EndObjectActuator::Attributes[] = {
        { NULL }        //Sentinel
 };
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 /* eof */
index 20c3168..51a3979 100644 (file)
@@ -40,7 +40,7 @@
 
 #include "PyObjectPlus.h" 
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* ------------------------------------------------------------------------- */
 /* Python functions                                                          */
@@ -110,7 +110,7 @@ KX_PYMETHODDEF_DOC(KX_SCA_ReplaceMeshActuator, instantReplaceMesh,
        Py_RETURN_NONE;
 }
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 /* ------------------------------------------------------------------------- */
 /* Native functions                                                          */
index 4a6ae9f..573ec76 100644 (file)
@@ -74,7 +74,7 @@ class KX_SCA_ReplaceMeshActuator : public SCA_IActuator
 
        void    InstantReplaceMesh();
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
        /* --------------------------------------------------------------------- */
        /* Python interface ---------------------------------------------------- */
@@ -90,7 +90,7 @@ class KX_SCA_ReplaceMeshActuator : public SCA_IActuator
 
        KX_PYMETHOD_DOC(KX_SCA_ReplaceMeshActuator,instantReplaceMesh);
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 }; 
 
index 3753f3d..c48112d 100644 (file)
@@ -208,7 +208,7 @@ KX_Scene::KX_Scene(class SCA_IInputDevice* keyboarddevice,
 
        m_bucketmanager=new RAS_BucketManager();
        
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        m_attr_dict = PyDict_New(); /* new ref */
        m_draw_call_pre = NULL;
        m_draw_call_post = NULL;
@@ -262,7 +262,7 @@ KX_Scene::~KX_Scene()
                delete m_bucketmanager;
        }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        PyDict_Clear(m_attr_dict);
        Py_DECREF(m_attr_dict);
 
@@ -1839,7 +1839,7 @@ void KX_Scene::Render2DFilters(RAS_ICanvas* canvas)
        m_filtermanager.RenderFilters(canvas);
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 void KX_Scene::RunDrawingCallbacks(PyObject* cb_list)
 {
@@ -2249,4 +2249,4 @@ KX_PYMETHODDEF_DOC(KX_Scene, get, "")
        return def;
 }
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
index cd8277e..9b4a6ec 100644 (file)
@@ -99,7 +99,7 @@ class KX_Scene : public PyObjectPlus, public SCA_IScene
 {
        Py_Header;
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        PyObject*       m_attr_dict;
        PyObject*       m_draw_call_pre;
        PyObject*       m_draw_call_post;
@@ -544,7 +544,7 @@ public:
        void Update2DFilter(vector<STR_String>& propNames, void* gameObj, RAS_2DFilterManager::RAS_2DFILTER_MODE filtermode, int pass, STR_String& text);
        void Render2DFilters(RAS_ICanvas* canvas);
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        /* --------------------------------------------------------------------- */
        /* Python interface ---------------------------------------------------- */
        /* --------------------------------------------------------------------- */
index 8f6000e..f991b84 100644 (file)
@@ -210,7 +210,7 @@ KX_Scene* KX_SceneActuator::FindScene(char * sceneName)
 }
 
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* ------------------------------------------------------------------------- */
 /* Python functions                                                          */
@@ -283,6 +283,6 @@ int KX_SceneActuator::pyattr_set_camera(void *self, const struct KX_PYATTRIBUTE_
        return PY_SET_ATTR_SUCCESS;
 }
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 /* eof */
index 360488f..b49357b 100644 (file)
@@ -89,7 +89,7 @@ class KX_SceneActuator : public SCA_IActuator
 
        virtual bool Update();
        
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
        virtual void Replace_IScene(SCA_IScene *val)
        {
@@ -103,7 +103,7 @@ class KX_SceneActuator : public SCA_IActuator
        static PyObject* pyattr_get_camera(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
        static int pyattr_set_camera(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 }; /* end of class KXSceneActuator */
 
index 9ebb365..d5f8aa7 100644 (file)
@@ -233,7 +233,7 @@ bool KX_SoundActuator::Update(double curtime, bool frame)
 }
 
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* ------------------------------------------------------------------------- */
 /* Python functions                                                          */
@@ -496,4 +496,4 @@ int KX_SoundActuator::pyattr_set_pitch(void *self, const struct KX_PYATTRIBUTE_D
        return PY_SET_ATTR_SUCCESS;
 }
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
index c175a18..7c1108e 100644 (file)
@@ -93,7 +93,7 @@ public:
        CValue* GetReplica();
        void ProcessReplica();
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
        /* -------------------------------------------------------------------- */
        /* Python interface --------------------------------------------------- */
@@ -115,7 +115,7 @@ public:
        static PyObject* pyattr_get_pitch(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
        static PyObject* pyattr_get_type(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 };
 
index 33f21f4..ff4c398 100644 (file)
@@ -124,7 +124,7 @@ void KX_StateActuator::Activate(SG_DList& head)
        }
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* ------------------------------------------------------------------------- */
 /* Python functions                                                          */
@@ -165,4 +165,4 @@ PyAttributeDef KX_StateActuator::Attributes[] = {
        { NULL }        //Sentinel
 };
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
index 9b44f48..b590624 100644 (file)
@@ -283,7 +283,7 @@ bool        KX_TouchSensor::NewHandleCollision(void*object1,void*object2,const PHY_Coll
        return false; // was DT_CONTINUE but this was defined in sumo as false.
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* ------------------------------------------------------------------------- */
 /* Python functions                                                          */
index c944889..80e5a0f 100644 (file)
@@ -118,7 +118,7 @@ public:
 
        // todo: put some info for collision maybe
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
        /* --------------------------------------------------------------------- */
        /* Python interface ---------------------------------------------------- */
index ae8d2f6..cae183a 100644 (file)
@@ -417,7 +417,7 @@ bool KX_TrackToActuator::Update(double curtime, bool frame)
        return result;
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* ------------------------------------------------------------------------- */
 /* Python functions                                                          */
@@ -486,6 +486,6 @@ int KX_TrackToActuator::pyattr_set_object(void *self, const struct KX_PYATTRIBUT
        return PY_SET_ATTR_SUCCESS;
 }
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 /* eof */
index 2b44994..33b2ecb 100644 (file)
@@ -69,7 +69,7 @@ class KX_TrackToActuator : public SCA_IActuator
        virtual void Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map);
        virtual bool Update(double curtime, bool frame);
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
        /* Python part */
 
@@ -77,7 +77,7 @@ class KX_TrackToActuator : public SCA_IActuator
        static PyObject* pyattr_get_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef);
        static int pyattr_set_object(void *self, const struct KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
        
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 }; /* end of class KX_TrackToActuator : public KX_EditObjectActuator */
 
index 4ee80c6..1736835 100644 (file)
@@ -29,7 +29,7 @@ KX_VehicleWrapper::~KX_VehicleWrapper()
        m_motionStates.clear();
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 PyObject* KX_VehicleWrapper::PyAddWheel(PyObject* args)
 {
@@ -319,4 +319,4 @@ PyAttributeDef KX_VehicleWrapper::Attributes[] = {
        { NULL }        //Sentinel
 };
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
index 2ca06da..4cde50b 100644 (file)
@@ -20,7 +20,7 @@ public:
        virtual ~KX_VehicleWrapper ();
        int                     getConstraintId();
        
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
        
        KX_PYMETHOD_VARARGS(KX_VehicleWrapper,AddWheel);
        KX_PYMETHOD_VARARGS(KX_VehicleWrapper,GetNumWheels);
@@ -47,7 +47,7 @@ public:
        KX_PYMETHOD_VARARGS(KX_VehicleWrapper,SetSuspensionCompression);
        
        KX_PYMETHOD_VARARGS(KX_VehicleWrapper,SetRollInfluence);
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 private:
        PHY_IVehicle*                    m_vehicle;
index 09630ad..f66d113 100644 (file)
@@ -26,7 +26,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 #include "KX_VertexProxy.h"
 #include "KX_MeshProxy.h"
@@ -553,4 +553,4 @@ PyObject* KX_VertexProxy::PySetUV2(PyObject* args)
        Py_RETURN_NONE;
 }
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
index b39d3ec..a5f2e5a 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef __KX_VERTEXPROXY
 #define __KX_VERTEXPROXY
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 #include "SCA_IObject.h"
 
@@ -102,7 +102,7 @@ public:
 
 };
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
 
 #endif //__KX_VERTEXPROXY
 
index e2f2bad..464dbd1 100644 (file)
@@ -79,7 +79,7 @@ KX_VisibilityActuator::Update()
        return false;
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* ------------------------------------------------------------------------- */
 /* Python functions                                                          */
@@ -121,4 +121,4 @@ PyAttributeDef KX_VisibilityActuator::Attributes[] = {
        { NULL }        //Sentinel
 };
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON
index 6f06d0f..5f7cf9e 100644 (file)
@@ -30,8 +30,7 @@ else:
 
 if env['WITH_BF_PYTHON']:
     incs += ' ' + env['BF_PYTHON_INC']
-else:
-    defs.append('DISABLE_PYTHON')
+    defs.append('WITH_PYTHON')
 
 if env['WITH_BF_FFMPEG']:
     defs.append('WITH_FFMPEG')
index 6cebe06..272d000 100644 (file)
@@ -24,8 +24,7 @@ defs = []
 
 if env['WITH_BF_PYTHON']:
     incs += ' ' + env['BF_PYTHON_INC']
-else:
-    defs.append('DISABLE_PYTHON')
+    defs.append('WITH_PYTHON')
 
 if env['WITH_BF_CXX_GUARDEDALLOC']:
     defs.append('WITH_CXX_GUARDEDALLOC')