rename definition for enabling the game engine GAMEBLENDER==1 --> WITH_GAMEENGINE
authorCampbell Barton <ideasman42@gmail.com>
Sun, 31 Oct 2010 03:20:33 +0000 (03:20 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 31 Oct 2010 03:20:33 +0000 (03:20 +0000)
18 files changed:
build_files/make/nan_compile.mk
source/blender/editors/space_logic/CMakeLists.txt
source/blender/editors/space_logic/SConscript
source/blender/editors/space_script/space_script.c
source/blender/editors/space_view3d/CMakeLists.txt
source/blender/editors/space_view3d/SConscript
source/blender/editors/space_view3d/view3d_view.c
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/SConscript
source/blender/makesrna/intern/rna_render.c
source/blender/windowmanager/CMakeLists.txt
source/blender/windowmanager/intern/wm_init_exit.c
source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
source/blenderplayer/bad_level_call_stubs/SConscript
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/CMakeLists.txt
source/creator/creator.c

index 4107bb1..a6d157d 100644 (file)
@@ -38,7 +38,7 @@ CPPFLAGS ?= $(NAN_CPPFLAGS)
 
 # Uncomment next lines to enable integrated game engine
 ifneq ($(NAN_NO_KETSJI), true)
-    CFLAGS  += -DGAMEBLENDER=1
+    CFLAGS  += -DWITH_GAMEENGINE
     ifeq ($(NAN_USE_BULLET), true)
       CFLAGS  += -DUSE_BULLET
       CCFLAGS += -DUSE_BULLET
index 64519d6..7716e45 100644 (file)
@@ -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}")
index 0ce2eee..4d02363 100644 (file)
@@ -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] )
index 66f630b..2036b0f 100644 (file)
@@ -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 */
index fb08601..e9ed833 100644 (file)
@@ -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)
index d907411..bb32f8b 100644 (file)
@@ -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']
 
index f876e42..089658c 100644 (file)
@@ -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);
index 674aeb2..68a292d 100644 (file)
@@ -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')
index ed84e4a..6ca5203 100644 (file)
@@ -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)
index 7029559..b37cfd5 100644 (file)
@@ -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')
index e6b86ae..ae965b2 100644 (file)
@@ -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
 }
index efdcd47..fa3a196 100644 (file)
@@ -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)
index b973600..b8e6cf5 100644 (file)
@@ -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) {
index a242c8b..28510b0 100644 (file)
@@ -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)
index 5d71f83..0217f1a 100644 (file)
@@ -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] )
index f297029..7bef93c 100644 (file)
@@ -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
index dd218e4..c8885cb 100644 (file)
@@ -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)
index 7e53ad5..0d7a313 100644 (file)
@@ -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