rename definition for enabling the game engine GAMEBLENDER==1 --> WITH_GAMEENGINE

17 files changed, 29 insertions, 27 deletions

diff --git a/source/blender/editors/space_logic/CMakeLists.txt b/source/blender/editors/space_logic/CMakeLists.txt
index 64519d606f1..7716e45167f 100644
--- a/source/blender/editors/space_logic/CMakeLists.txt
+++ b/source/blender/editors/space_logic/CMakeLists.txt
@@ -38,7 +38,7 @@ SET(SRC
 )
 
 IF(WITH_GAMEENGINE)
-	ADD_DEFINITIONS(-DGAMEBLENDER)
+	ADD_DEFINITIONS(-DWITH_GAMEENGINE)
 ENDIF(WITH_GAMEENGINE)
 
 BLENDERLIB(bf_editor_space_logic "${SRC}" "${INC}")
diff --git a/source/blender/editors/space_logic/SConscript b/source/blender/editors/space_logic/SConscript
index 0ce2eee575e..4d02363ff90 100644
--- a/source/blender/editors/space_logic/SConscript
+++ b/source/blender/editors/space_logic/SConscript
@@ -10,6 +10,6 @@ incs += ' ../../makesrna ../interface'
 defs = []
 
 if env['WITH_BF_GAMEENGINE']:
-    defs.append('GAMEBLENDER=1')
+    defs.append('WITH_GAMEENGINE')
 
 env.BlenderLib ( 'bf_editors_space_game', sources, Split(incs), defs, libtype=['core'], priority=[120] )
diff --git a/source/blender/editors/space_script/space_script.c b/source/blender/editors/space_script/space_script.c
index 66f630bb5b3..2036b0f730a 100644
--- a/source/blender/editors/space_script/space_script.c
+++ b/source/blender/editors/space_script/space_script.c
@@ -155,6 +155,8 @@ static void script_main_area_draw(const bContext *C, ARegion *ar)
 		//BPY_run_python_script_space(scpt->script.filename, NULL);
 		BPY_run_script_space_draw(C, sscript);
 	}
+#else
+	(void)sscript;
 #endif
 	
 	/* reset view matrix */
diff --git a/source/blender/editors/space_view3d/CMakeLists.txt b/source/blender/editors/space_view3d/CMakeLists.txt
index fb086013798..e9ed8335061 100644
--- a/source/blender/editors/space_view3d/CMakeLists.txt
+++ b/source/blender/editors/space_view3d/CMakeLists.txt
@@ -55,7 +55,7 @@ SET(SRC
 
 IF(WITH_GAMEENGINE)
 	LIST(APPEND INC ../../../kernel/gen_system)
-	ADD_DEFINITIONS(-DGAMEBLENDER)
+	ADD_DEFINITIONS(-DWITH_GAMEENGINE)
 ENDIF(WITH_GAMEENGINE)
 
 IF(WIN32)
diff --git a/source/blender/editors/space_view3d/SConscript b/source/blender/editors/space_view3d/SConscript
index d9074113ba9..bb32f8b926e 100644
--- a/source/blender/editors/space_view3d/SConscript
+++ b/source/blender/editors/space_view3d/SConscript
@@ -12,7 +12,7 @@ incs += ' #/intern/smoke/extern'
 incs += ' #source/kernel/gen_system'
 
 if env['WITH_BF_GAMEENGINE']:
-    defs.append('GAMEBLENDER=1')
+    defs.append('WITH_GAMEENGINE')
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
     incs += ' ' + env['BF_PTHREADS_INC']
 
diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c
index f876e420d89..089658c6953 100644
--- a/source/blender/editors/space_view3d/view3d_view.c
+++ b/source/blender/editors/space_view3d/view3d_view.c
@@ -56,7 +56,7 @@
 #include "ED_screen.h"
 #include "ED_armature.h"
 
-#if GAMEBLENDER == 1
+#ifdef WITH_GAMEENGINE
 #include "SYS_System.h"
 #endif
 
@@ -1609,7 +1609,7 @@ void VIEW3D_OT_localview(wmOperatorType *ot)
 	ot->poll= ED_operator_view3d_active;
 }
 
-#if GAMEBLENDER == 1
+#ifdef WITH_GAMEENGINE
 
 static ListBase queue_back;
 static void SaveState(bContext *C)
@@ -1701,7 +1701,7 @@ void game_set_commmandline_options(GameData *gm)
 /* maybe we need this defined somewhere else */
 extern void StartKetsjiShell(struct bContext *C, struct ARegion *ar, rcti *cam_frame, int always_use_expand_framing);
 
-#endif // GAMEBLENDER == 1
+#endif // WITH_GAMEENGINE
 
 int game_engine_poll(bContext *C)
 {
@@ -1753,7 +1753,7 @@ int ED_view3d_context_activate(bContext *C)
 
 static int game_engine_exec(bContext *C, wmOperator *op)
 {
-#if GAMEBLENDER == 1
+#ifdef WITH_GAMEENGINE
 	Scene *startscene = CTX_data_scene(C);
 	ScrArea *sa, *prevsa= CTX_wm_area(C);
 	ARegion *ar, *prevar= CTX_wm_region(C);
diff --git a/source/blender/makesrna/SConscript b/source/blender/makesrna/SConscript
index 674aeb264c3..68a292d8386 100644
--- a/source/blender/makesrna/SConscript
+++ b/source/blender/makesrna/SConscript
@@ -46,7 +46,7 @@ if env['WITH_BF_LCMS']:
     incs += ' ' + env['BF_LCMS_INC']
     
 if env['WITH_BF_GAMEENGINE']:
-    defs.append('GAMEBLENDER=1')
+    defs.append('WITH_GAMEENGINE')
 
 if env['BF_UNIT_TEST']:
     defs.append('UNIT_TEST')
diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt
index ed84e4a50a9..6ca5203d249 100644
--- a/source/blender/makesrna/intern/CMakeLists.txt
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@@ -74,7 +74,7 @@ IF(WIN32)
 ENDIF(WIN32)
 
 IF(WITH_GAMEENGINE)
-	ADD_DEFINITIONS(-DGAMEBLENDER)
+	ADD_DEFINITIONS(-DWITH_GAME_ENGINE)
 ENDIF(WITH_GAMEENGINE)
 
 IF(WITH_IMAGE_OPENEXR)
diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript
index 702955980fd..b37cfd5c38b 100644
--- a/source/blender/makesrna/intern/SConscript
+++ b/source/blender/makesrna/intern/SConscript
@@ -68,7 +68,7 @@ if env['WITH_BF_LCMS']:
     defs.append('WITH_LCMS')
 
 if env['WITH_BF_GAMEENGINE']:
-    defs.append('GAMEBLENDER=1')
+    defs.append('WITH_GAMEENGINE')
     
 if env['WITH_BF_FFTW3']:
     defs.append('FFTW3=1')
diff --git a/source/blender/makesrna/intern/rna_render.c b/source/blender/makesrna/intern/rna_render.c
index e6b86ae8766..ae965b237cd 100644
--- a/source/blender/makesrna/intern/rna_render.c
+++ b/source/blender/makesrna/intern/rna_render.c
@@ -47,7 +47,7 @@
 
 static RenderEngineType internal_render_type = {
 	NULL, NULL, "BLENDER_RENDER", "Blender Render", RE_INTERNAL, NULL, {NULL, NULL, NULL, NULL}};
-#if GAMEBLENDER == 1
+#ifdef WITH_GAMEENGINE
 static RenderEngineType internal_game_type = {
 	NULL, NULL, "BLENDER_GAME", "Blender Game", RE_INTERNAL|RE_GAME, NULL, {NULL, NULL, NULL, NULL}};
 #endif
@@ -57,7 +57,7 @@ ListBase R_engines = {NULL, NULL};
 void RE_engines_init()
 {
 	BLI_addtail(&R_engines, &internal_render_type);
-#if GAMEBLENDER == 1
+#ifdef WITH_GAMEENGINE
 	BLI_addtail(&R_engines, &internal_game_type);
 #endif
 }
diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt
index efdcd47ea72..fa3a196d9c5 100644
--- a/source/blender/windowmanager/CMakeLists.txt
+++ b/source/blender/windowmanager/CMakeLists.txt
@@ -91,7 +91,7 @@ ELSE(WITH_PYTHON)
 ENDIF(WITH_PYTHON)
 
 IF(WITH_GAMEENGINE)
-	ADD_DEFINITIONS(-DGAMEBLENDER)
+	ADD_DEFINITIONS(-DWITH_GAMEENGINE)
 ENDIF(WITH_GAMEENGINE)
 
 IF(WIN32)
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c
index b9736009d32..b8e6cf5424d 100644
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@ -65,7 +65,7 @@
 #include "BPY_extern.h"
 #endif
 
-#if GAMEBLENDER == 1
+#ifdef WITH_GAME_ENGINE
 #include "SYS_System.h"
 #endif
 
@@ -434,7 +434,7 @@ void WM_exit(bContext *C)
 	wm_ghost_exit();
 
 	CTX_free(C);
-#if GAMEBLENDER == 1
+#ifdef WITH_GAME_ENGINE
 	SYS_DeleteSystem(SYS_GetSystem());
 #endif
 	if(MEM_get_memory_blocks_in_use()!=0) {
diff --git a/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt b/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
index a242c8b7551..28510b0a113 100644
--- a/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
+++ b/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
@@ -48,7 +48,7 @@ IF(WITH_BUILDINFO)
 ENDIF(WITH_BUILDINFO)
 
 IF(WITH_GAMEENGINE)
-	ADD_DEFINITIONS(-DGAMEBLENDER)
+	ADD_DEFINITIONS(-DWITH_GAMEENGINE)
 ENDIF(WITH_GAMEENGINE)
 
 IF(WITH_INTERNATIONAL)
diff --git a/source/blenderplayer/bad_level_call_stubs/SConscript b/source/blenderplayer/bad_level_call_stubs/SConscript
index 5d71f83719f..0217f1aeacc 100644
--- a/source/blenderplayer/bad_level_call_stubs/SConscript
+++ b/source/blenderplayer/bad_level_call_stubs/SConscript
@@ -12,6 +12,6 @@ if env['WITH_BF_INTERNATIONAL']:
     defs += 'WITH_FREETYPE2'
 
 if env['WITH_BF_GAMEENGINE']:
-    defs += ' GAMEBLENDER=1'
+    defs += ' WITH_GAMEENGINE'
 
 env.BlenderLib ('blenkernel_blc', sources = Split(sources), includes=Split(incs), defines=Split(defs), libtype=['player'],priority=[220] )
diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c
index f2970293b05..7bef93cc4d8 100644
--- a/source/blenderplayer/bad_level_call_stubs/stubs.c
+++ b/source/blenderplayer/bad_level_call_stubs/stubs.c
@@ -28,7 +28,7 @@
  * BKE_bad_level_calls function stubs
  */
 
-#if GAMEBLENDER == 1
+#ifdef WITH_GAMEENGINE
 #include <stdlib.h>
 #include "DNA_listBase.h"
 #include "RNA_types.h"
@@ -443,4 +443,4 @@ int CSG_PerformBooleanOperation(
 	CSG_VertexIteratorDescriptor	obBVertices)
 	{ return 0;}
 
-#endif // GAMEBLENDER == 1
+#endif // WITH_GAMEENGINE
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index dd218e474a4..c8885cbba11 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -79,7 +79,7 @@ ELSE(WITH_PYTHON)
 ENDIF(WITH_PYTHON)
 
 IF(WITH_GAMEENGINE)
-	ADD_DEFINITIONS(-DGAMEBLENDER)
+	ADD_DEFINITIONS(-DWITH_GAMEENGINE)
 ENDIF(WITH_GAMEENGINE)
 
 IF(NOT WITH_SDL)
diff --git a/source/creator/creator.c b/source/creator/creator.c
index 7e53ad5d648..0d7a31340ed 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -97,7 +97,7 @@
 #include "GPU_extensions.h"
 
 /* for passing information between creator and gameengine */
-#if GAMEBLENDER == 1
+#ifdef WITH_GAMEENGINE
 #include "SYS_System.h"
 #else /* dummy */
 #define SYS_SystemHandle int
@@ -448,7 +448,7 @@ static int register_extension(int UNUSED(argc), char **UNUSED(argv), void *data)
 
 static int no_joystick(int UNUSED(argc), char **UNUSED(argv), void *data)
 {
-#if GAMEBLENDER != 1
+#ifndef WITH_GAMEENGINE
 	(void)data;
 #else
 	SYS_SystemHandle *syshandle = data;
@@ -642,7 +642,7 @@ static int set_extension(int argc, char **argv, void *data)
 static int set_ge_parameters(int argc, char **argv, void *data)
 {
 	int a = 0;
-#if GAMEBLENDER == 1
+#ifdef WITH_GAMEENGINE
 	SYS_SystemHandle syshandle = *(SYS_SystemHandle*)data;
 #else
 	(void)data;
@@ -668,7 +668,7 @@ example:
 			{
 				a++;
 				/* assignment */
-#if GAMEBLENDER == 1
+#ifdef WITH_GAMEENGINE
 				SYS_WriteCommandLineString(syshandle,paramname,argv[a]);
 #endif
 			}  else
@@ -679,7 +679,7 @@ example:
 			/* name arg eaten */
 
 		} else {
-#if GAMEBLENDER == 1
+#ifdef WITH_GAMEENGINE
 			SYS_WriteCommandLineInt(syshandle,argv[a],1);
 #endif
 			/* doMipMap */
@@ -1093,7 +1093,7 @@ int main(int argc, char **argv)
 
 	IMB_init();
 
-#if GAMEBLENDER == 1
+#ifdef WITH_GAMEENGINE
 	syshandle = SYS_GetSystem();
 	GEN_init_messaging_system();
 #else