Revision: 32784
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32784
Author: campbellbarton
Date: 2010-10-31 02:56:46 +0200 (Sun, 31 Oct 2010)
Log Message:
-----------
dont build blender/kernel if the game engines disabled.
Modified Paths:
--------------
trunk/blender/source/CMakeLists.txt
trunk/blender/source/SConscript
trunk/blender/source/blender/windowmanager/CMakeLists.txt
trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
trunk/blender/source/creator/CMakeLists.txt
trunk/blender/source/creator/creator.c
Modified: trunk/blender/source/CMakeLists.txt
===================================================================
--- trunk/blender/source/CMakeLists.txt 2010-10-31 00:05:56 UTC (rev 32783)
+++ trunk/blender/source/CMakeLists.txt 2010-10-31 00:56:46 UTC (rev 32784)
@@ -25,9 +25,9 @@
# ***** END GPL LICENSE BLOCK *****
ADD_SUBDIRECTORY(blender)
-ADD_SUBDIRECTORY(kernel)
IF(WITH_GAMEENGINE)
+ ADD_SUBDIRECTORY(kernel)
ADD_SUBDIRECTORY(gameengine)
ENDIF(WITH_GAMEENGINE)
Modified: trunk/blender/source/SConscript
===================================================================
--- trunk/blender/source/SConscript 2010-10-31 00:05:56 UTC (rev 32783)
+++ trunk/blender/source/SConscript 2010-10-31 00:56:46 UTC (rev 32784)
@@ -1,11 +1,10 @@
#!/usr/bin/python
Import ('env')
-SConscript(['blender/SConscript',
- 'kernel/SConscript',
- 'creator/SConscript'])
+SConscript(['blender/SConscript', 'creator/SConscript'])
+
if env['WITH_BF_GAMEENGINE']:
- SConscript (['gameengine/SConscript'])
+ SConscript (['kernel/SConscript', 'gameengine/SConscript'])
if env['WITH_BF_PLAYER']:
SConscript (['blenderplayer/bad_level_call_stubs/SConscript'])
Modified: trunk/blender/source/blender/windowmanager/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/windowmanager/CMakeLists.txt 2010-10-31 00:05:56 UTC (rev 32783)
+++ trunk/blender/source/blender/windowmanager/CMakeLists.txt 2010-10-31 00:56:46 UTC (rev 32784)
@@ -90,6 +90,10 @@
ADD_DEFINITIONS(-DDISABLE_PYTHON)
ENDIF(WITH_PYTHON)
+IF(WITH_GAMEENGINE)
+ ADD_DEFINITIONS(-DGAMEBLENDER)
+ENDIF(WITH_GAMEENGINE)
+
IF(WIN32)
LIST(APPEND INC ${PTHREADS_INC})
ENDIF(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 00:05:56 UTC (rev 32783)
+++ trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c 2010-10-31 00:56:46 UTC (rev 32784)
@@ -65,7 +65,9 @@
#include "BPY_extern.h"
#endif
+#if GAMEBLENDER == 1
#include "SYS_System.h"
+#endif
#include "RNA_define.h"
@@ -432,9 +434,9 @@
wm_ghost_exit();
CTX_free(C);
-
+#if GAMEBLENDER == 1
SYS_DeleteSystem(SYS_GetSystem());
-
+#endif
if(MEM_get_memory_blocks_in_use()!=0) {
printf("Error Totblock: %d\n", MEM_get_memory_blocks_in_use());
MEM_printmemlist();
Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt 2010-10-31 00:05:56 UTC (rev 32783)
+++ trunk/blender/source/creator/CMakeLists.txt 2010-10-31 00:56:46 UTC (rev 32784)
@@ -78,6 +78,10 @@
ADD_DEFINITIONS(-DDISABLE_PYTHON)
ENDIF(WITH_PYTHON)
+IF(WITH_GAMEENGINE)
+ ADD_DEFINITIONS(-DGAMEBLENDER)
+ENDIF(WITH_GAMEENGINE)
+
IF(NOT WITH_SDL)
ADD_DEFINITIONS(-DDISABLE_SDL)
ENDIF(NOT WITH_SDL)
Modified: trunk/blender/source/creator/creator.c
===================================================================
--- trunk/blender/source/creator/creator.c 2010-10-31 00:05:56 UTC (rev 32783)
+++ trunk/blender/source/creator/creator.c 2010-10-31 00:56:46 UTC (rev 32784)
@@ -97,7 +97,11 @@
#include "GPU_extensions.h"
/* for passing information between creator and gameengine */
+#if GAMEBLENDER == 1
#include "SYS_System.h"
+#else /* dummy */
+#define SYS_SystemHandle int
+#endif
#include <signal.h>
@@ -444,6 +448,9 @@
static int no_joystick(int UNUSED(argc), char **UNUSED(argv), void *data)
{
+#if GAMEBLENDER != 1
+ (void)data;
+#else
SYS_SystemHandle *syshandle = data;
/**
@@ -452,6 +459,7 @@
*/
SYS_WriteCommandLineInt(*syshandle, "nojoystick",1);
if (G.f & G_DEBUG) printf("disabling nojoystick\n");
+#endif
return 0;
}
@@ -633,8 +641,13 @@
static int set_ge_parameters(int argc, char **argv, void *data)
{
+ int a = 0;
+#if GAMEBLENDER == 1
SYS_SystemHandle syshandle = *(SYS_SystemHandle*)data;
- int a = 0;
+#else
+ (void)data;
+#endif
+
/**
gameengine parameters are automaticly put into system
-g [paramname = value]
@@ -655,7 +668,9 @@
{
a++;
/* assignment */
+#if GAMEBLENDER == 1
SYS_WriteCommandLineString(syshandle,paramname,argv[a]);
+#endif
} else
{
printf("error: argument assignment (%s) without value.\n",paramname);
@@ -664,8 +679,9 @@
/* name arg eaten */
} else {
+#if GAMEBLENDER == 1
SYS_WriteCommandLineInt(syshandle,argv[a],1);
-
+#endif
/* doMipMap */
if (!strcmp(argv[a],"nomipmap"))
{
@@ -1077,8 +1093,12 @@
IMB_init();
+#if GAMEBLENDER == 1
syshandle = SYS_GetSystem();
GEN_init_messaging_system();
+#else
+ syshandle= 0;
+#endif
/* first test for background */
ba = BLI_argsInit(argc, argv); /* skip binary path */