Rampoina/MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- fixed windows build (removed gl2 references)

Browse Source
This commit is contained in:
SoftCoder 2013-12-14 02:29:32 -08:00
parent 209458adee
commit ec13e904d3
2 changed files with 2 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
source/shared_lib/include/platform/sdl/factory_repository.h
View File

@ -13,19 +13,9 @@
#define _SHARED_PLATFORM_FACTORYREPOSITORY_H_ #define _SHARED_PLATFORM_FACTORYREPOSITORY_H_
#include <string> #include <string>
#include "graphics_factory.h" #include "graphics_factory.h"
#include "sound_factory.h" #include "sound_factory.h"
#include "graphics_factory_gl.h" #include "graphics_factory_gl.h"
#ifdef WIN32
#include "graphics_factory_gl2.h"
//#include "sound_factory_ds8.h"
#endif
#include "sound_factory_openal.h" #include "sound_factory_openal.h"
#include "sound_factory_none.h" #include "sound_factory_none.h"
#include "leak_dumper.h" #include "leak_dumper.h"
@ -35,24 +25,16 @@ using std::string;
using Shared::Graphics::GraphicsFactory; using Shared::Graphics::GraphicsFactory;
using Shared::Sound::SoundFactory; using Shared::Sound::SoundFactory;
using Shared::Graphics::Gl::GraphicsFactoryGl; using Shared::Graphics::Gl::GraphicsFactoryGl;
#ifdef WIN32
using Shared::Graphics::Gl::GraphicsFactoryGl2;
//using Shared::Sound::Ds8::SoundFactoryDs8;
#endif
using Shared::Sound::OpenAL::SoundFactoryOpenAL; using Shared::Sound::OpenAL::SoundFactoryOpenAL;
using Shared::Sound::SoundFactoryNone; using Shared::Sound::SoundFactoryNone;
namespace Shared{ namespace Platform{ namespace Shared { namespace Platform {
// ===================================================== // =====================================================
// class FactoryRepository // class FactoryRepository
// ===================================================== // =====================================================
class FactoryRepository{ class FactoryRepository {
private: private:
FactoryRepository(){}; FactoryRepository(){};
FactoryRepository(const FactoryRepository& ); FactoryRepository(const FactoryRepository& );
@ -60,14 +42,6 @@ private:
private: private:
GraphicsFactoryGl graphicsFactoryGl; GraphicsFactoryGl graphicsFactoryGl;
#ifdef WIN32
GraphicsFactoryGl2 graphicsFactoryGl2;
//SoundFactoryDs8 soundFactoryDs8;
#endif
SoundFactoryOpenAL soundFactoryOpenAL; SoundFactoryOpenAL soundFactoryOpenAL;
SoundFactoryNone soundFactoryNone; SoundFactoryNone soundFactoryNone;

3
source/shared_lib/sources/platform/win32/factory_repository.cpp
View File

@ -28,9 +28,6 @@ GraphicsFactory *FactoryRepository::getGraphicsFactory(const string &name){
if(name == "OpenGL"){ if(name == "OpenGL"){
return &graphicsFactoryGl; return &graphicsFactoryGl;
} }
else if(name == "OpenGL2"){
return &graphicsFactoryGl2;
}
throw megaglest_runtime_error("Unknown graphics factory: [" + name + "]"); throw megaglest_runtime_error("Unknown graphics factory: [" + name + "]");
} }