BlenderPlayer linking again for cmake - 148 errors gone.

After talking with Ton and Campbell we agreed that it wouldn't hurt to have blenderplayer again (specially now since BGE is almost 100% working in 2.5).
However in order to make it link, I needed to bring back stubs, a lot of so-called bad calls.

I'm not sure how we should proceed from here, but it looks like people could start to take a look at source/blenderplayer/bad_level_calls_stubs/stubs.c and fix their own modules/functions

** NOTE: I removed the sound calls from BlenderPlayer. In order to fix it look at //XXX ADD SOUND in GPG_Application.cpp and GPC_Engine

*** tested in CMake+MSVC.
- Scons is not building !!! (why does the building systems have to be so different?)
And someone may like to fix make. (take a look at /trunk/source/blender/blenkernel/bad_level_call_stubs/Makefile )

**** it may work better inside /source/gameengine/GamePlayer
This commit is contained in:
Dalai Felinto
2009-09-03 02:55:23 +00:00
parent ac3f0695a2
commit 6239d18d50
7 changed files with 302 additions and 4 deletions

View File

@@ -84,7 +84,10 @@ extern "C"
#include "KX_BlenderSceneConverter.h"
#include "NG_LoopBackNetworkDeviceInterface.h"
#include "SND_DeviceManager.h"
#if 0 //XXX - ADD SOUND
#include "SND_DeviceManager.h"
#endif
#include "GPC_MouseDevice.h"
#include "GPC_RenderTools.h"
@@ -584,13 +587,16 @@ bool GPG_Application::initEngine(GHOST_IWindow* window, const int stereoMode)
if (!m_networkdevice)
goto initFailed;
#if 0 //XXX - ADD SOUND
// get an audiodevice
SND_DeviceManager::Subscribe();
m_audiodevice = SND_DeviceManager::Instance();
if (!m_audiodevice)
goto initFailed;
m_audiodevice->UseCD();
#endif
// create a ketsjisystem (only needed for timing and stuff)
m_kxsystem = new GPG_System (m_system);
if (!m_kxsystem)
@@ -607,7 +613,9 @@ bool GPG_Application::initEngine(GHOST_IWindow* window, const int stereoMode)
m_ketsjiengine->SetRenderTools(m_rendertools);
m_ketsjiengine->SetRasterizer(m_rasterizer);
m_ketsjiengine->SetNetworkDevice(m_networkdevice);
#if 0 //XXX - ADD SOUND
m_ketsjiengine->SetAudioDevice(m_audiodevice);
#endif
m_ketsjiengine->SetTimingDisplay(frameRate, false, false);
CValue::SetDeprecationWarnings(nodepwarnings);
@@ -621,7 +629,9 @@ bool GPG_Application::initEngine(GHOST_IWindow* window, const int stereoMode)
return m_engineInitialized;
initFailed:
delete m_kxsystem;
#if 0 // XXX - ADD SOUND
delete m_audiodevice;
#endif
delete m_networkdevice;
delete m_mouse;
delete m_keyboard;
@@ -680,7 +690,7 @@ bool GPG_Application::startEngine(void)
KX_Scene* startscene = new KX_Scene(m_keyboard,
m_mouse,
m_networkdevice,
m_audiodevice,
// m_audiodevice, // XXX ADD SOUND
startscenename,
m_startScene);
@@ -783,8 +793,10 @@ void GPG_Application::exitEngine()
}
if (m_audiodevice)
{
#if 0 //XXX - ADD SOUND
SND_DeviceManager::Unsubscribe();
m_audiodevice = 0;
#endif
}
if (m_networkdevice)
{