Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2010-10-31 06:20:33 +0300
committerCampbell Barton <ideasman42@gmail.com>2010-10-31 06:20:33 +0300
commit50dab4fc37d33352c2f1c6181da9d54799e36a12 (patch)
tree377a667ff5778262c0e280d1dc6be2b90b2e9479 /source/blenderplayer
parent73f21f20b789ed1474274b0d27778eede4108569 (diff)
rename definition for enabling the game engine GAMEBLENDER==1 --> WITH_GAMEENGINE
Diffstat (limited to 'source/blenderplayer')
-rw-r--r--source/blenderplayer/bad_level_call_stubs/CMakeLists.txt2
-rw-r--r--source/blenderplayer/bad_level_call_stubs/SConscript2
-rw-r--r--source/blenderplayer/bad_level_call_stubs/stubs.c4
3 files changed, 4 insertions, 4 deletions
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