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/creator
parent73f21f20b789ed1474274b0d27778eede4108569 (diff)
rename definition for enabling the game engine GAMEBLENDER==1 --> WITH_GAMEENGINE
Diffstat (limited to 'source/creator')
-rw-r--r--source/creator/CMakeLists.txt2
-rw-r--r--source/creator/creator.c12
2 files changed, 7 insertions, 7 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index dd218e474a4..c8885cbba11 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -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)
diff --git a/source/creator/creator.c b/source/creator/creator.c
index 7e53ad5d648..0d7a31340ed 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -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