Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

B

Browse Source 
Linking of blenderplayer was failing with unresolved symbols
(initVideoTexture) when building without FFMPEG. Needs
testing with SCons and Makefiles.
This commit is contained in:
Chris Want
2008-12-15 20:53:45 +00:00
parent b99f74c8e8
commit 024b4b3dda
4 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/gameengine/GamePlayer/ghost/CMakeLists.txt
View File

@@ -70,5 +70,9 @@ SET(INC
${PYTHON_INC} ${PYTHON_INC}
) )
IF(WITH_FFMPEG)
ADD_DEFINITIONS(-DWITH_FFMPEG)
ENDIF(WITH_FFMPEG)
BLENDERLIB_NOLIST(gp_ghost "${SRC}" "${INC}") BLENDERLIB_NOLIST(gp_ghost "${SRC}" "${INC}")
#env.BlenderLib (libname='gp_ghost', sources=source_files, includes = incs, defines = [], libtype='player',priority=0, compileflags=cflags) #env.BlenderLib (libname='gp_ghost', sources=source_files, includes = incs, defines = [], libtype='player',priority=0, compileflags=cflags)

3
source/gameengine/GamePlayer/ghost/GPG_Application.cpp
View File

@@ -686,8 +686,9 @@ bool GPG_Application::startEngine(void)
initGameKeys(); initGameKeys();
initPythonConstraintBinding(); initPythonConstraintBinding();
initMathutils(); initMathutils();
#ifdef WITH_FFMPEG
initVideoTexture(); initVideoTexture();
#endif
// Set the GameLogic.globalDict from marshal'd data, so we can // Set the GameLogic.globalDict from marshal'd data, so we can
// load new blend files and keep data in GameLogic.globalDict // load new blend files and keep data in GameLogic.globalDict
loadGamePythonConfig(m_pyGlobalDictString, m_pyGlobalDictString_Length); loadGamePythonConfig(m_pyGlobalDictString, m_pyGlobalDictString_Length);

3
source/gameengine/GamePlayer/ghost/Makefile
View File

@@ -82,3 +82,6 @@ CPPFLAGS += -I$(NAN_STRING)/include
CPPFLAGS += -I$(NAN_GHOST)/include CPPFLAGS += -I$(NAN_GHOST)/include
CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION)
ifeq ($(WITH_FFMPEG), true)
CPPFLAGS += -DWITH_FFMPEG
endif

2
source/gameengine/GamePlayer/ghost/SConscript
View File

@@ -49,5 +49,7 @@ cflags = []
if env['OURPLATFORM']=='win32-vc': if env['OURPLATFORM']=='win32-vc':
cflags = ['/GR'] cflags = ['/GR']
if env['WITH_BF_FFMPEG']:
defs += ' WITH_FFMPEG'
env.BlenderLib (libname='gp_ghost', sources=source_files, includes = incs, defines = [], libtype='player',priority=0, compileflags=cflags) env.BlenderLib (libname='gp_ghost', sources=source_files, includes = incs, defines = [], libtype='player',priority=0, compileflags=cflags)