[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36950] branches/soc-2010-jwilkins/source/ gameengine/Ketsji/KXNetwork: Merge Cleanup.

[Jason Wilkins]

Revision: 36950
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36950
Author:   jwilkins
Date:     2011-05-27 12:42:11 +0000 (Fri, 27 May 2011)
Log Message:
-----------
Merge Cleanup.
Third attempt to make sure branch is a copy of trunk revision 36905.  A few more fixes.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36905

Modified Paths:
--------------
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
    branches/soc-2010-jwilkins/source/gameengine/Ketsji/KXNetwork/SConscript

Modified: branches/soc-2010-jwilkins/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
===================================================================
--- branches/soc-2010-jwilkins/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp	2011-05-27 12:13:10 UTC (rev 36949)
+++ branches/soc-2010-jwilkins/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp	2011-05-27 12:42:11 UTC (rev 36950)
@@ -98,7 +98,7 @@
 	return replica;
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* -------------------------------------------------------------------- */
 /* Python interface --------------------------------------------------- */
@@ -139,4 +139,4 @@
 	{ NULL }	//Sentinel
 };
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON

Modified: branches/soc-2010-jwilkins/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
===================================================================
--- branches/soc-2010-jwilkins/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp	2011-05-27 12:13:10 UTC (rev 36949)
+++ branches/soc-2010-jwilkins/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp	2011-05-27 12:42:11 UTC (rev 36950)
@@ -161,7 +161,7 @@
 	return m_IsUp;
 }
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 /* --------------------------------------------------------------------- */
 /* Python interface ---------------------------------------------------- */
@@ -222,4 +222,4 @@
 	}
 }
 
-#endif // DISABLE_PYTHON
+#endif // WITH_PYTHON

Modified: branches/soc-2010-jwilkins/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
===================================================================
--- branches/soc-2010-jwilkins/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h	2011-05-27 12:13:10 UTC (rev 36949)
+++ branches/soc-2010-jwilkins/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h	2011-05-27 12:42:11 UTC (rev 36950)
@@ -75,7 +75,7 @@
 		m_NetworkScene= val;
 	};
 
-#ifndef DISABLE_PYTHON
+#ifdef WITH_PYTHON
 
 	/* ------------------------------------------------------------- */
 	/* Python interface -------------------------------------------- */
@@ -85,7 +85,7 @@
 	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
 
 };
 

Modified: branches/soc-2010-jwilkins/source/gameengine/Ketsji/KXNetwork/SConscript
===================================================================
--- branches/soc-2010-jwilkins/source/gameengine/Ketsji/KXNetwork/SConscript	2011-05-27 12:13:10 UTC (rev 36949)
+++ branches/soc-2010-jwilkins/source/gameengine/Ketsji/KXNetwork/SConscript	2011-05-27 12:42:11 UTC (rev 36950)
@@ -11,8 +11,7 @@
 defs = []
 
 if env['WITH_BF_PYTHON']:
-	incs += ' ' + env['BF_PYTHON_INC']
-else:
-	defs.append('DISABLE_PYTHON')
+    incs += ' ' + env['BF_PYTHON_INC']
+    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'])