[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32787] trunk/blender: rename definition for enabling the game engine GAMEBLENDER==1 --> WITH_GAMEENGINE
Campbell Barton
ideasman42 at gmail.com
Sun Oct 31 04:20:36 CET 2010
Revision: 32787
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32787
Author: campbellbarton
Date: 2010-10-31 04:20:33 +0100 (Sun, 31 Oct 2010)
Log Message:
-----------
rename definition for enabling the game engine GAMEBLENDER==1 --> WITH_GAMEENGINE
Modified Paths:
--------------
trunk/blender/build_files/make/nan_compile.mk
trunk/blender/source/blender/editors/space_logic/CMakeLists.txt
trunk/blender/source/blender/editors/space_logic/SConscript
trunk/blender/source/blender/editors/space_script/space_script.c
trunk/blender/source/blender/editors/space_view3d/CMakeLists.txt
trunk/blender/source/blender/editors/space_view3d/SConscript
trunk/blender/source/blender/editors/space_view3d/view3d_view.c
trunk/blender/source/blender/makesrna/SConscript
trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
trunk/blender/source/blender/makesrna/intern/SConscript
trunk/blender/source/blender/makesrna/intern/rna_render.c
trunk/blender/source/blender/windowmanager/CMakeLists.txt
trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
trunk/blender/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
trunk/blender/source/blenderplayer/bad_level_call_stubs/SConscript
trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
trunk/blender/source/creator/CMakeLists.txt
trunk/blender/source/creator/creator.c
Modified: trunk/blender/build_files/make/nan_compile.mk
===================================================================
--- trunk/blender/build_files/make/nan_compile.mk 2010-10-31 01:18:26 UTC (rev 32786)
+++ trunk/blender/build_files/make/nan_compile.mk 2010-10-31 03:20:33 UTC (rev 32787)
@@ -38,7 +38,7 @@
# 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
Modified: trunk/blender/source/blender/editors/space_logic/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/space_logic/CMakeLists.txt 2010-10-31 01:18:26 UTC (rev 32786)
+++ trunk/blender/source/blender/editors/space_logic/CMakeLists.txt 2010-10-31 03:20:33 UTC (rev 32787)
@@ -38,7 +38,7 @@
)
IF(WITH_GAMEENGINE)
- ADD_DEFINITIONS(-DGAMEBLENDER)
+ ADD_DEFINITIONS(-DWITH_GAMEENGINE)
ENDIF(WITH_GAMEENGINE)
BLENDERLIB(bf_editor_space_logic "${SRC}" "${INC}")
Modified: trunk/blender/source/blender/editors/space_logic/SConscript
===================================================================
--- trunk/blender/source/blender/editors/space_logic/SConscript 2010-10-31 01:18:26 UTC (rev 32786)
+++ trunk/blender/source/blender/editors/space_logic/SConscript 2010-10-31 03:20:33 UTC (rev 32787)
@@ -10,6 +10,6 @@
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] )
Modified: trunk/blender/source/blender/editors/space_script/space_script.c
===================================================================
--- trunk/blender/source/blender/editors/space_script/space_script.c 2010-10-31 01:18:26 UTC (rev 32786)
+++ trunk/blender/source/blender/editors/space_script/space_script.c 2010-10-31 03:20:33 UTC (rev 32787)
@@ -155,6 +155,8 @@
//BPY_run_python_script_space(scpt->script.filename, NULL);
BPY_run_script_space_draw(C, sscript);
}
+#else
+ (void)sscript;
#endif
/* reset view matrix */
Modified: trunk/blender/source/blender/editors/space_view3d/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/CMakeLists.txt 2010-10-31 01:18:26 UTC (rev 32786)
+++ trunk/blender/source/blender/editors/space_view3d/CMakeLists.txt 2010-10-31 03:20:33 UTC (rev 32787)
@@ -55,7 +55,7 @@
IF(WITH_GAMEENGINE)
LIST(APPEND INC ../../../kernel/gen_system)
- ADD_DEFINITIONS(-DGAMEBLENDER)
+ ADD_DEFINITIONS(-DWITH_GAMEENGINE)
ENDIF(WITH_GAMEENGINE)
IF(WIN32)
Modified: trunk/blender/source/blender/editors/space_view3d/SConscript
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/SConscript 2010-10-31 01:18:26 UTC (rev 32786)
+++ trunk/blender/source/blender/editors/space_view3d/SConscript 2010-10-31 03:20:33 UTC (rev 32787)
@@ -12,7 +12,7 @@
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']
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_view.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_view.c 2010-10-31 01:18:26 UTC (rev 32786)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_view.c 2010-10-31 03:20:33 UTC (rev 32787)
@@ -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 @@
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 @@
/* 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 @@
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);
Modified: trunk/blender/source/blender/makesrna/SConscript
===================================================================
--- trunk/blender/source/blender/makesrna/SConscript 2010-10-31 01:18:26 UTC (rev 32786)
+++ trunk/blender/source/blender/makesrna/SConscript 2010-10-31 03:20:33 UTC (rev 32787)
@@ -46,7 +46,7 @@
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')
Modified: trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/makesrna/intern/CMakeLists.txt 2010-10-31 01:18:26 UTC (rev 32786)
+++ trunk/blender/source/blender/makesrna/intern/CMakeLists.txt 2010-10-31 03:20:33 UTC (rev 32787)
@@ -74,7 +74,7 @@
ENDIF(WIN32)
IF(WITH_GAMEENGINE)
- ADD_DEFINITIONS(-DGAMEBLENDER)
+ ADD_DEFINITIONS(-DWITH_GAME_ENGINE)
ENDIF(WITH_GAMEENGINE)
IF(WITH_IMAGE_OPENEXR)
Modified: trunk/blender/source/blender/makesrna/intern/SConscript
===================================================================
--- trunk/blender/source/blender/makesrna/intern/SConscript 2010-10-31 01:18:26 UTC (rev 32786)
+++ trunk/blender/source/blender/makesrna/intern/SConscript 2010-10-31 03:20:33 UTC (rev 32787)
@@ -68,7 +68,7 @@
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')
Modified: trunk/blender/source/blender/makesrna/intern/rna_render.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_render.c 2010-10-31 01:18:26 UTC (rev 32786)
+++ trunk/blender/source/blender/makesrna/intern/rna_render.c 2010-10-31 03:20:33 UTC (rev 32787)
@@ -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 @@
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
}
Modified: trunk/blender/source/blender/windowmanager/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/windowmanager/CMakeLists.txt 2010-10-31 01:18:26 UTC (rev 32786)
+++ trunk/blender/source/blender/windowmanager/CMakeLists.txt 2010-10-31 03:20:33 UTC (rev 32787)
@@ -91,7 +91,7 @@
ENDIF(WITH_PYTHON)
IF(WITH_GAMEENGINE)
- ADD_DEFINITIONS(-DGAMEBLENDER)
+ ADD_DEFINITIONS(-DWITH_GAMEENGINE)
ENDIF(WITH_GAMEENGINE)
IF(WIN32)
Modified: trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c 2010-10-31 01:18:26 UTC (rev 32786)
+++ trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c 2010-10-31 03:20:33 UTC (rev 32787)
@@ -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 @@
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) {
Modified: trunk/blender/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
===================================================================
--- trunk/blender/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt 2010-10-31 01:18:26 UTC (rev 32786)
+++ trunk/blender/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt 2010-10-31 03:20:33 UTC (rev 32787)
@@ -48,7 +48,7 @@
ENDIF(WITH_BUILDINFO)
IF(WITH_GAMEENGINE)
- ADD_DEFINITIONS(-DGAMEBLENDER)
+ ADD_DEFINITIONS(-DWITH_GAMEENGINE)
ENDIF(WITH_GAMEENGINE)
IF(WITH_INTERNATIONAL)
Modified: trunk/blender/source/blenderplayer/bad_level_call_stubs/SConscript
===================================================================
--- trunk/blender/source/blenderplayer/bad_level_call_stubs/SConscript 2010-10-31 01:18:26 UTC (rev 32786)
+++ trunk/blender/source/blenderplayer/bad_level_call_stubs/SConscript 2010-10-31 03:20:33 UTC (rev 32787)
@@ -12,6 +12,6 @@
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] )
Modified: trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
===================================================================
--- trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c 2010-10-31 01:18:26 UTC (rev 32786)
+++ trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c 2010-10-31 03:20:33 UTC (rev 32787)
@@ -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 @@
CSG_VertexIteratorDescriptor obBVertices)
{ return 0;}
-#endif // GAMEBLENDER == 1
+#endif // WITH_GAMEENGINE
Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt 2010-10-31 01:18:26 UTC (rev 32786)
+++ trunk/blender/source/creator/CMakeLists.txt 2010-10-31 03:20:33 UTC (rev 32787)
@@ -79,7 +79,7 @@
ENDIF(WITH_PYTHON)
IF(WITH_GAMEENGINE)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list