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:
@@ -58,7 +58,9 @@
|
||||
#include "NG_LoopBackNetworkDeviceInterface.h"
|
||||
|
||||
#include "RAS_IRenderTools.h"
|
||||
#include "SND_DeviceManager.h"
|
||||
#if 0 //XXX - ADD SOUND
|
||||
#include "SND_DeviceManager.h"
|
||||
#endif
|
||||
|
||||
#include "GPC_Engine.h"
|
||||
#include "GPC_KeyboardDevice.h"
|
||||
@@ -339,8 +341,10 @@ void GPC_Engine::Exit()
|
||||
|
||||
if (m_audiodevice)
|
||||
{
|
||||
#if 0 //XXX - ADD SOUND
|
||||
SND_DeviceManager::Unsubscribe();
|
||||
m_audiodevice = 0;
|
||||
#endif
|
||||
}
|
||||
|
||||
m_initialized = false;
|
||||
|
||||
Reference in New Issue
Block a user