diff options
Diffstat (limited to 'source/blender/editors')
6 files changed, 10 insertions, 8 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); |