diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-10-31 06:20:33 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-10-31 06:20:33 +0300 |
| commit | 50dab4fc37d33352c2f1c6181da9d54799e36a12 (patch) | |
| tree | 377a667ff5778262c0e280d1dc6be2b90b2e9479 /source/blender/makesrna | |
| parent | 73f21f20b789ed1474274b0d27778eede4108569 (diff) | |
rename definition for enabling the game engine GAMEBLENDER==1 --> WITH_GAMEENGINE
Diffstat (limited to 'source/blender/makesrna')
| -rw-r--r-- | source/blender/makesrna/SConscript | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/SConscript | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_render.c | 4 |
4 files changed, 5 insertions, 5 deletions
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 } |