forked from bartvdbraak/blender
rename definition for enabling the game engine GAMEBLENDER==1 --> WITH_GAMEENGINE
This commit is contained in:
parent
73f21f20b7
commit
50dab4fc37
@ -38,7 +38,7 @@ CPPFLAGS ?= $(NAN_CPPFLAGS)
|
||||
|
||||
# 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
|
||||
|
@ -38,7 +38,7 @@ SET(SRC
|
||||
)
|
||||
|
||||
IF(WITH_GAMEENGINE)
|
||||
ADD_DEFINITIONS(-DGAMEBLENDER)
|
||||
ADD_DEFINITIONS(-DWITH_GAMEENGINE)
|
||||
ENDIF(WITH_GAMEENGINE)
|
||||
|
||||
BLENDERLIB(bf_editor_space_logic "${SRC}" "${INC}")
|
||||
|
@ -10,6 +10,6 @@ incs += ' ../../makesrna ../interface'
|
||||
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] )
|
||||
|
@ -155,6 +155,8 @@ static void script_main_area_draw(const bContext *C, ARegion *ar)
|
||||
//BPY_run_python_script_space(scpt->script.filename, NULL);
|
||||
BPY_run_script_space_draw(C, sscript);
|
||||
}
|
||||
#else
|
||||
(void)sscript;
|
||||
#endif
|
||||
|
||||
/* reset view matrix */
|
||||
|
@ -55,7 +55,7 @@ SET(SRC
|
||||
|
||||
IF(WITH_GAMEENGINE)
|
||||
LIST(APPEND INC ../../../kernel/gen_system)
|
||||
ADD_DEFINITIONS(-DGAMEBLENDER)
|
||||
ADD_DEFINITIONS(-DWITH_GAMEENGINE)
|
||||
ENDIF(WITH_GAMEENGINE)
|
||||
|
||||
IF(WIN32)
|
||||
|
@ -12,7 +12,7 @@ incs += ' #/intern/smoke/extern'
|
||||
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']
|
||||
|
||||
|
@ -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 @@ void VIEW3D_OT_localview(wmOperatorType *ot)
|
||||
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 @@ void game_set_commmandline_options(GameData *gm)
|
||||
/* 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 @@ int ED_view3d_context_activate(bContext *C)
|
||||
|
||||
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);
|
||||
|
@ -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')
|
||||
|
@ -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)
|
||||
|
@ -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')
|
||||
|
@ -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
|
||||
}
|
||||
|
@ -91,7 +91,7 @@ ELSE(WITH_PYTHON)
|
||||
ENDIF(WITH_PYTHON)
|
||||
|
||||
IF(WITH_GAMEENGINE)
|
||||
ADD_DEFINITIONS(-DGAMEBLENDER)
|
||||
ADD_DEFINITIONS(-DWITH_GAMEENGINE)
|
||||
ENDIF(WITH_GAMEENGINE)
|
||||
|
||||
IF(WIN32)
|
||||
|
@ -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 @@ void WM_exit(bContext *C)
|
||||
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) {
|
||||
|
@ -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)
|
||||
|
@ -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] )
|
||||
|
@ -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
|
||||
|
@ -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)
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user