diff options
Diffstat (limited to 'source/gameengine/GamePlayer/ghost')
12 files changed, 174 insertions, 158 deletions
diff --git a/source/gameengine/GamePlayer/ghost/CMakeLists.txt b/source/gameengine/GamePlayer/ghost/CMakeLists.txt index 8164878762c..dc137861745 100644 --- a/source/gameengine/GamePlayer/ghost/CMakeLists.txt +++ b/source/gameengine/GamePlayer/ghost/CMakeLists.txt @@ -24,15 +24,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(SRC - GPG_Application.cpp - GPG_Canvas.cpp - GPG_ghost.cpp - GPG_KeyboardDevice.cpp - GPG_System.cpp -) - -SET(INC +set(INC . ../../../../intern/string ../../../../intern/ghost @@ -44,11 +36,11 @@ SET(INC ../../../../source/gameengine/Converter ../../../../source/blender/imbuf ../../../../source/gameengine/Ketsji + ../../../../source/blender/blenfont ../../../../source/blender/blenlib ../../../../source/blender/blenkernel ../../../../source/blender/readblenfile ../../../../source/blender - ../../../../source/blender/include ../../../../source/blender/makesdna ../../../../source/blender/makesrna ../../../../source/gameengine/Rasterizer @@ -59,17 +51,29 @@ SET(INC ../../../../source/gameengine/Physics/common ../../../../source/gameengine/Network/LoopBackNetwork ../../../../source/gameengine/GamePlayer/common - ../../../../source/blender/misc ../../../../source/blender/blenloader ../../../../source/blender/gpu ../../../../extern/glew/include - ${PYTHON_INC} + ${PYTHON_INCLUDE_DIRS} +) + +set(SRC + GPG_Application.cpp + GPG_Canvas.cpp + GPG_ghost.cpp + GPG_KeyboardDevice.cpp + GPG_System.cpp + + GPG_Application.h + GPG_Canvas.h + GPG_KeyboardDevice.h + GPG_System.h ) -ADD_DEFINITIONS(-DGLEW_STATIC) +add_definitions(-DGLEW_STATIC) -IF(WITH_FFMPEG) - ADD_DEFINITIONS(-DWITH_FFMPEG) -ENDIF(WITH_FFMPEG) +if(WITH_CODEC_FFMPEG) + add_definitions(-DWITH_FFMPEG) +endif() -BLENDERLIB_NOLIST(gp_ghost "${SRC}" "${INC}") +blender_add_lib_nolist(ge_player_ghost "${SRC}" "${INC}") diff --git a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp index 71507642226..e00a890a1fb 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_Application.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_Application.cpp @@ -1,4 +1,4 @@ -/** +/* * $Id$ * * ***** BEGIN GPL LICENSE BLOCK ***** @@ -28,6 +28,11 @@ * GHOST Blender Player application implementation file. */ +/** \file gameengine/GamePlayer/ghost/GPG_Application.cpp + * \ingroup player + */ + + #ifdef WIN32 #pragma warning (disable:4786) // suppress stl-MSVC debug info warning #include <windows.h> @@ -370,6 +375,7 @@ bool GPG_Application::startFullScreen( fSystem->beginFullScreen(setting, &m_mainWindow, stereoVisual); m_mainWindow->setCursorVisibility(false); + m_mainWindow->setState(GHOST_kWindowStateFullScreen); success = initEngine(m_mainWindow, stereoMode); if (success) { @@ -545,7 +551,10 @@ bool GPG_Application::initEngine(GHOST_IWindow* window, const int stereoMode) if (!m_canvas) return false; - m_canvas->Init(); + m_canvas->Init(); + if (gm->flag & GAME_SHOW_MOUSE) + m_canvas->SetMouseState(RAS_ICanvas::MOUSE_NORMAL); + m_rendertools = new GPC_RenderTools(); if (!m_rendertools) goto initFailed; @@ -602,8 +611,11 @@ bool GPG_Application::initEngine(GHOST_IWindow* window, const int stereoMode) m_ketsjiengine->SetNetworkDevice(m_networkdevice); m_ketsjiengine->SetTimingDisplay(frameRate, false, false); - +#ifdef WITH_PYTHON CValue::SetDeprecationWarnings(nodepwarnings); +#else + (void)nodepwarnings; +#endif m_ketsjiengine->SetUseFixedTime(fixed_framerate); m_ketsjiengine->SetTimingDisplay(frameRate, profile, properties); @@ -676,20 +688,21 @@ bool GPG_Application::startEngine(void) m_startScene, m_canvas); -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON // some python things PyObject *gameLogic, *gameLogic_keys; setupGamePython(m_ketsjiengine, startscene, m_maggie, NULL, &gameLogic, &gameLogic_keys, m_argc, m_argv); -#endif // DISABLE_PYTHON +#endif // WITH_PYTHON //initialize Dome Settings if(m_startScene->gm.stereoflag == STEREO_DOME) m_ketsjiengine->InitDome(m_startScene->gm.dome.res, m_startScene->gm.dome.mode, m_startScene->gm.dome.angle, m_startScene->gm.dome.resbuf, m_startScene->gm.dome.tilt, m_startScene->gm.dome.warptext); +#ifdef WITH_PYTHON // Set the GameLogic.globalDict from marshal'd data, so we can // load new blend files and keep data in GameLogic.globalDict loadGamePythonConfig(m_pyGlobalDictString, m_pyGlobalDictString_Length); - +#endif m_sceneconverter->ConvertScene( startscene, m_rendertools, @@ -722,6 +735,7 @@ bool GPG_Application::startEngine(void) void GPG_Application::stopEngine() { +#ifdef WITH_PYTHON // GameLogic.globalDict gets converted into a buffer, and sorted in // m_pyGlobalDictString so we can restore after python has stopped // and started between .blend file loads. @@ -734,6 +748,8 @@ void GPG_Application::stopEngine() // when exiting the mainloop exitGamePythonScripting(); +#endif + m_ketsjiengine->StopEngine(); m_networkdevice->Disconnect(); @@ -794,7 +810,6 @@ void GPG_Application::exitEngine() m_canvas = 0; } - IMB_exit(); GPU_extensions_exit(); m_exitRequested = 0; diff --git a/source/gameengine/GamePlayer/ghost/GPG_Application.h b/source/gameengine/GamePlayer/ghost/GPG_Application.h index 48a6c8e78ec..850b34d5b69 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_Application.h +++ b/source/gameengine/GamePlayer/ghost/GPG_Application.h @@ -1,4 +1,4 @@ -/** +/* * $Id$ * * ***** BEGIN GPL LICENSE BLOCK ***** @@ -25,7 +25,11 @@ * Contributor(s): none yet. * * ***** END GPL LICENSE BLOCK ***** - * GHOST Blender Player application declaration file. + */ + +/** \file GPG_Application.h + * \ingroup player + * \brief GHOST Blender Player application declaration file. */ #include "GHOST_IEventConsumer.h" diff --git a/source/gameengine/GamePlayer/ghost/GPG_Canvas.cpp b/source/gameengine/GamePlayer/ghost/GPG_Canvas.cpp index 24c0102a87c..9bd41163c21 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_Canvas.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_Canvas.cpp @@ -1,4 +1,4 @@ -/** +/* * $Id$ * * ***** BEGIN GPL LICENSE BLOCK ***** @@ -27,6 +27,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file gameengine/GamePlayer/ghost/GPG_Canvas.cpp + * \ingroup player + */ + + #include "GPG_Canvas.h" #include <assert.h> #include "GHOST_ISystem.h" diff --git a/source/gameengine/GamePlayer/ghost/GPG_Canvas.h b/source/gameengine/GamePlayer/ghost/GPG_Canvas.h index 7b19c03d3c3..e03f7d6740e 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_Canvas.h +++ b/source/gameengine/GamePlayer/ghost/GPG_Canvas.h @@ -1,4 +1,4 @@ -/** +/* * $Id$ * * ***** BEGIN GPL LICENSE BLOCK ***** @@ -27,6 +27,10 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file GPG_Canvas.h + * \ingroup player + */ + #ifndef _GPG_CANVAS_H_ #define _GPG_CANVAS_H_ diff --git a/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.cpp b/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.cpp index 2e9810ad0ae..97e166ce6ab 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.cpp @@ -1,4 +1,4 @@ -/** +/* * $Id$ * * ***** BEGIN GPL LICENSE BLOCK ***** @@ -28,6 +28,11 @@ * GHOST Blender Player keyboard device implementation. */ +/** \file gameengine/GamePlayer/ghost/GPG_KeyboardDevice.cpp + * \ingroup player + */ + + #include "GPG_KeyboardDevice.h" GPG_KeyboardDevice::GPG_KeyboardDevice(void) diff --git a/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.h b/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.h index 8fb42caed95..5471db42f3f 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.h +++ b/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.h @@ -1,4 +1,4 @@ -/** +/* * $Id$ * * ***** BEGIN GPL LICENSE BLOCK ***** @@ -25,7 +25,11 @@ * Contributor(s): none yet. * * ***** END GPL LICENSE BLOCK ***** - * GHOST Blender Player keyboard device. + */ + +/** \file GPG_KeyboardDevice.h + * \ingroup player + * \brief GHOST Blender Player keyboard device. */ #ifndef _GPG_KEYBOARDDEVICE_H_ diff --git a/source/gameengine/GamePlayer/ghost/GPG_System.cpp b/source/gameengine/GamePlayer/ghost/GPG_System.cpp index 94756ec4ed5..1faa3f398c4 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_System.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_System.cpp @@ -1,4 +1,4 @@ -/** +/* * $Id$ * * ***** BEGIN GPL LICENSE BLOCK ***** @@ -28,6 +28,11 @@ * Blender Player system on GHOST. */ +/** \file gameengine/GamePlayer/ghost/GPG_System.cpp + * \ingroup player + */ + + #include "GPG_System.h" #include <assert.h> #include "GHOST_ISystem.h" diff --git a/source/gameengine/GamePlayer/ghost/GPG_System.h b/source/gameengine/GamePlayer/ghost/GPG_System.h index e6e5506cbc1..49a91b60415 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_System.h +++ b/source/gameengine/GamePlayer/ghost/GPG_System.h @@ -1,4 +1,4 @@ -/** +/* * $Id$ * * ***** BEGIN GPL LICENSE BLOCK ***** @@ -25,7 +25,11 @@ * Contributor(s): none yet. * * ***** END GPL LICENSE BLOCK ***** - * Blender Player system on GHOST. + */ + +/** \file GPG_System.h + * \ingroup player + * \brief Blender Player system on GHOST. */ #ifndef _GPG_SYSTEM_H_ diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp index 9cdee2a340c..767ccff4259 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp @@ -1,4 +1,4 @@ -/** +/* * $Id$ * * ***** BEGIN GPL LICENSE BLOCK ***** @@ -28,6 +28,11 @@ * Start up of the Blender Player on GHOST. */ +/** \file gameengine/GamePlayer/ghost/GPG_ghost.cpp + * \ingroup player + */ + + #include <iostream> #include <math.h> @@ -72,6 +77,11 @@ extern "C" extern char bprogname[]; /* holds a copy of argv[0], from creator.c */ extern char btempdir[]; /* use this to store a valid temp directory */ +// For BLF +#include "BLF_api.h" +extern int datatoc_bfont_ttf_size; +extern char datatoc_bfont_ttf[]; + #ifdef __cplusplus } #endif // __cplusplus @@ -95,15 +105,15 @@ extern char btempdir[]; /* use this to store a valid temp directory */ #ifdef WIN32 #include <windows.h> -#ifdef NDEBUG +#if !defined(DEBUG) #include <wincon.h> -#endif // NDEBUG +#endif // !defined(DEBUG) #endif // WIN32 const int kMinWindowWidth = 100; const int kMinWindowHeight = 100; -char bprogname[FILE_MAXDIR+FILE_MAXFILE]; +char bprogname[FILE_MAX]; #ifdef WIN32 typedef enum @@ -161,17 +171,29 @@ static BOOL scr_saver_init(int argc, char **argv) #endif /* WIN32 */ -void usage(const char* program) +void usage(const char* program, bool isBlenderPlayer) { const char * consoleoption; + const char * filename = ""; + const char * pathname = ""; + #ifdef _WIN32 consoleoption = "-c "; #else consoleoption = ""; #endif + + if (isBlenderPlayer) { + filename = "filename.blend"; +#ifdef _WIN32 + pathname = "c:\\"; +#else + pathname = "//home//user//"; +#endif + } printf("usage: %s [-w [w h l t]] [-f [fw fh fb ff]] %s[-g gamengineoptions] " - "[-s stereomode] filename.blend\n", program, consoleoption); + "[-s stereomode] %s\n", program, consoleoption, filename); printf(" -h: Prints this command summary\n\n"); printf(" -w: display in a window\n"); printf(" --Optional parameters--\n"); @@ -227,8 +249,8 @@ void usage(const char* program) printf("\n"); printf(" - : all arguments after this are ignored, allowing python to access them from sys.argv\n"); printf("\n"); - printf("example: %s -w 320 200 10 10 -g noaudio c:\\loadtest.blend\n", program); - printf("example: %s -g show_framerate = 0 c:\\loadtest.blend\n", program); + printf("example: %s -w 320 200 10 10 -g noaudio%s%s\n", program, pathname, filename); + printf("example: %s -g show_framerate = 0 %s%s\n", program, pathname, filename); } static void get_filename(int argc, char **argv, char *filename) @@ -337,15 +359,15 @@ int main(int argc, char** argv) int fullScreenBpp = 32; int fullScreenFrequency = 60; GHOST_TEmbedderWindowID parentWindow = 0; - - + bool isBlenderPlayer = false; + int validArguments=0; #ifdef __linux__ #ifdef __alpha__ signal (SIGFPE, SIG_IGN); #endif /* __alpha__ */ #endif /* __linux__ */ - BLI_where_am_i(bprogname, argv[0]); + BLI_where_am_i(bprogname, sizeof(bprogname), argv[0]); #ifdef __APPLE__ // Can't use Carbon right now because of double defined type ID (In Carbon.h and DNA_ID.h, sigh) /* @@ -377,9 +399,14 @@ int main(int argc, char** argv) GEN_init_messaging_system(); IMB_init(); + + // Setup builtin font for BLF (mostly copied from creator.c, wm_init_exit.c and interface_style.c) + BLF_init(11, U.dpi); + BLF_lang_init(); + BLF_load_mem("default", (unsigned char*)datatoc_bfont_ttf, datatoc_bfont_ttf_size); // Parse command line options -#ifndef NDEBUG +#if defined(DEBUG) printf("argv[0] = '%s'\n", argv[0]); #endif @@ -412,14 +439,21 @@ int main(int argc, char** argv) U.audioformat = 0x24; U.audiochannels = 2; - for (i = 1; (i < argc) && !error + /* if running blenderplayer the last argument can't be parsed since it has to be the filename. */ + isBlenderPlayer = !blo_is_a_runtime(argv[0]); + if (isBlenderPlayer) + validArguments = argc - 1; + else + validArguments = argc; + + for (i = 1; (i < validArguments) && !error #ifdef WIN32 && scr_saver_mode == SCREEN_SAVER_MODE_NONE #endif ;) { -#ifndef NDEBUG +#if defined(DEBUG) printf("argv[%d] = '%s' , %i\n", i, argv[i],argc); #endif if (argv[i][0] == '-') @@ -436,21 +470,21 @@ int main(int argc, char** argv) // Parse game options { i++; - if (i < argc) + if (i <= validArguments) { char* paramname = argv[i]; // Check for single value versus assignment - if (i+1 < argc && (*(argv[i+1]) == '=')) + if (i+1 <= validArguments && (*(argv[i+1]) == '=')) { i++; - if (i + 1 < argc) + if (i + 1 <= validArguments) { i++; // Assignment SYS_WriteCommandLineInt(syshandle, paramname, atoi(argv[i])); SYS_WriteCommandLineFloat(syshandle, paramname, atof(argv[i])); SYS_WriteCommandLineString(syshandle, paramname, argv[i]); -#ifndef NDEBUG +#if defined(DEBUG) printf("%s = '%s'\n", paramname, argv[i]); #endif i++; @@ -479,14 +513,14 @@ int main(int argc, char** argv) i++; fullScreen = true; fullScreenParFound = true; - if ((i + 2) <= argc && argv[i][0] != '-' && argv[i+1][0] != '-') + if ((i + 2) <= validArguments && argv[i][0] != '-' && argv[i+1][0] != '-') { fullScreenWidth = atoi(argv[i++]); fullScreenHeight = atoi(argv[i++]); - if ((i + 1) <= argc && argv[i][0] != '-') + if ((i + 1) <= validArguments && argv[i][0] != '-') { fullScreenBpp = atoi(argv[i++]); - if ((i + 1) <= argc && argv[i][0] != '-') + if ((i + 1) <= validArguments && argv[i][0] != '-') fullScreenFrequency = atoi(argv[i++]); } } @@ -497,11 +531,11 @@ int main(int argc, char** argv) fullScreen = false; windowParFound = true; - if ((i + 2) <= argc && argv[i][0] != '-' && argv[i+1][0] != '-') + if ((i + 2) <= validArguments && argv[i][0] != '-' && argv[i+1][0] != '-') { windowWidth = atoi(argv[i++]); windowHeight = atoi(argv[i++]); - if ((i +2) <= argc && argv[i][0] != '-' && argv[i+1][0] != '-') + if ((i + 2) <= validArguments && argv[i][0] != '-' && argv[i+1][0] != '-') { windowLeft = atoi(argv[i++]); windowTop = atoi(argv[i++]); @@ -510,17 +544,22 @@ int main(int argc, char** argv) break; case 'h': - usage(argv[0]); + usage(argv[0], isBlenderPlayer); return 0; break; #ifndef _WIN32 case 'i': i++; - if ( (i + 1) < argc ) - parentWindow = atoi(argv[i++]); -#ifndef NDEBUG + if ( (i + 1) <= validArguments ) + parentWindow = atoi(argv[i++]); + else { + error = true; + printf("error: too few options for parent window argument.\n"); + } + +#if defined(DEBUG) printf("XWindows ID = %d\n", parentWindow); -#endif //NDEBUG +#endif // defined(DEBUG) #endif // _WIN32 case 'c': @@ -529,7 +568,7 @@ int main(int argc, char** argv) break; case 's': // stereo i++; - if ((i + 1) < argc) + if ((i + 1) <= validArguments) { stereomode = (RAS_IRasterizer::StereoMode) atoi(argv[i]); if (stereomode < RAS_IRasterizer::RAS_STEREO_NOSTEREO || stereomode >= RAS_IRasterizer::RAS_STEREO_MAXSTEREO) @@ -575,7 +614,7 @@ int main(int argc, char** argv) stereoFlag = STEREO_DOME; stereomode = RAS_IRasterizer::RAS_STEREO_DOME; i++; - if ((i + 1) < argc) + if ((i + 1) <= validArguments) { if(!strcmp(argv[i], "angle")){ i++; @@ -631,7 +670,7 @@ int main(int argc, char** argv) if (error ) { - usage(argv[0]); + usage(argv[0], isBlenderPlayer); return 0; } @@ -714,19 +753,19 @@ int main(int argc, char** argv) //::printf("game data loaded from %s\n", filename); if (!bfd) { - usage(argv[0]); + usage(argv[0], isBlenderPlayer); error = true; exitcode = KX_EXIT_REQUEST_QUIT_GAME; } else { #ifdef WIN32 -#ifdef NDEBUG +#if !defined(DEBUG) if (closeConsole) { //::FreeConsole(); // Close a console window } -#endif // NDEBUG +#endif // !defined(DEBUG) #endif // WIN32 Main *maggie = bfd->main; Scene *scene = bfd->curscene; @@ -797,9 +836,10 @@ int main(int argc, char** argv) app.SetGameEngineData(maggie, scene, argc, argv); /* this argc cant be argc_py_clamped, since python uses it */ BLI_strncpy(pathname, maggie->name, sizeof(pathname)); - BLI_strncpy(G.sce, maggie->name, sizeof(G.sce)); - setGamePythonPath(G.sce); - + BLI_strncpy(G.main->name, maggie->name, sizeof(G.main->name)); +#ifdef WITH_PYTHON + setGamePythonPath(G.main->name); +#endif if (firstTimeRunning) { firstTimeRunning = false; @@ -908,8 +948,14 @@ int main(int argc, char** argv) } } + // Cleanup + RNA_exit(); + BLF_exit(); + IMB_exit(); free_nodesystem(); + SYS_DeleteSystem(syshandle); + return error ? -1 : 0; } diff --git a/source/gameengine/GamePlayer/ghost/Makefile b/source/gameengine/GamePlayer/ghost/Makefile deleted file mode 100644 index b2fcd2ac1ff..00000000000 --- a/source/gameengine/GamePlayer/ghost/Makefile +++ /dev/null @@ -1,86 +0,0 @@ -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# -# ***** END GPL LICENSE BLOCK ***** -# -# Makefile for GHOST game player - -LIBNAME = ghost -DIR = $(OCGDIR)/gameengine/GamePlayer/ghost - -include nan_compile.mk - -CCFLAGS += $(LEVEL_1_CPP_WARNINGS) - -# OpenGL header files -CPPFLAGS += -I$(NAN_GLEW)/include -CPPFLAGS += -I$(OPENGL_HEADERS) -CPPFLAGS += -I$(NAN_STRING)/include -CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include - -CPPFLAGS += -I../../GamePlayer/common - -# Game Engine includes -CPPFLAGS += -I../../Converter -CPPFLAGS += -I../../Expressions -CPPFLAGS += -I../../GameLogic -CPPFLAGS += -I../../Ketsji -CPPFLAGS += -I../../Ketsji/KXNetwork -CPPFLAGS += -I../../Network -CPPFLAGS += -I../../Network/LoopBackNetwork -CPPFLAGS += -I../../Rasterizer -CPPFLAGS += -I../../Rasterizer/RAS_OpenGLRasterizer -CPPFLAGS += -I../../SceneGraph - -# Sumo -CPPFLAGS += -I$(SRCHOME)/gameengine/Physics/Sumo/include -CPPFLAGS += -I$(SRCHOME)/gameengine/Physics/Sumo/Fuzzics/include - -CPPFLAGS += -I$(NAN_MOTO)/include - -# Blender includes -CPPFLAGS += -I../../../blender/blenkernel -CPPFLAGS += -I../../../blender/blenlib -CPPFLAGS += -I../../../blender/blenloader -CPPFLAGS += -I../../../blender/imbuf -CPPFLAGS += -I../../../blender/makesdna -CPPFLAGS += -I../../../blender/makesrna -CPPFLAGS += -I../../../blender/readblenfile -CPPFLAGS += -I../../../blender/gpu - -CPPFLAGS += -I../../../gameengine/BlenderRoutines - -# kernel? GEN? stuff -CPPFLAGS += -I../../../kernel/gen_system -CPPFLAGS += -I../../../kernel/gen_messaging - -CPPFLAGS += -I$(NAN_STRING)/include -CPPFLAGS += -I$(NAN_GHOST)/include -CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) - -ifeq ($(WITH_FFMPEG), true) - CPPFLAGS += -DWITH_FFMPEG -endif diff --git a/source/gameengine/GamePlayer/ghost/SConscript b/source/gameengine/GamePlayer/ghost/SConscript index 41520a06c66..0ff19a9b621 100644 --- a/source/gameengine/GamePlayer/ghost/SConscript +++ b/source/gameengine/GamePlayer/ghost/SConscript @@ -19,6 +19,7 @@ incs = ['.', '#source/gameengine/Converter', '#source/blender/imbuf', '#source/gameengine/Ketsji', + '#source/blender/blenfont', '#source/blender/blenlib', '#source/blender/blenkernel', '#source/blender/readblenfile', @@ -43,11 +44,16 @@ incs = ['.', defs = [ 'GLEW_STATIC' ] if env['WITH_BF_PYTHON']: +<<<<<<< .working incs += Split(env['BF_PYTHON_INC']) else: defs.append('DISABLE_PYTHON') +======= + incs += Split(env['BF_PYTHON_INC']) + defs.append('WITH_PYTHON') +>>>>>>> .merge-right.r35190 if env['WITH_BF_FFMPEG']: defs.append('WITH_FFMPEG') -env.BlenderLib (libname='gp_ghost', sources=source_files, includes = incs, defines = defs, libtype=['player'],priority=[0], cxx_compileflags=env['BGE_CXXFLAGS']) +env.BlenderLib (libname='ge_player_ghost', sources=source_files, includes = incs, defines = defs, libtype=['player'],priority=[0], cxx_compileflags=env['BGE_CXXFLAGS']) |