diff --git a/source/shared_lib/include/platform/sdl/factory_repository.h b/source/shared_lib/include/platform/sdl/factory_repository.h index a4382b5c..e9985cad 100644 --- a/source/shared_lib/include/platform/sdl/factory_repository.h +++ b/source/shared_lib/include/platform/sdl/factory_repository.h @@ -13,19 +13,9 @@ #define _SHARED_PLATFORM_FACTORYREPOSITORY_H_ #include - #include "graphics_factory.h" #include "sound_factory.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_none.h" #include "leak_dumper.h" @@ -35,24 +25,16 @@ using std::string; using Shared::Graphics::GraphicsFactory; using Shared::Sound::SoundFactory; 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::SoundFactoryNone; -namespace Shared{ namespace Platform{ +namespace Shared { namespace Platform { // ===================================================== // class FactoryRepository // ===================================================== -class FactoryRepository{ +class FactoryRepository { private: FactoryRepository(){}; FactoryRepository(const FactoryRepository& ); @@ -60,14 +42,6 @@ private: private: GraphicsFactoryGl graphicsFactoryGl; - -#ifdef WIN32 - - GraphicsFactoryGl2 graphicsFactoryGl2; - //SoundFactoryDs8 soundFactoryDs8; - -#endif - SoundFactoryOpenAL soundFactoryOpenAL; SoundFactoryNone soundFactoryNone; diff --git a/source/shared_lib/sources/platform/win32/factory_repository.cpp b/source/shared_lib/sources/platform/win32/factory_repository.cpp index 61ad1c4a..5037a845 100644 --- a/source/shared_lib/sources/platform/win32/factory_repository.cpp +++ b/source/shared_lib/sources/platform/win32/factory_repository.cpp @@ -28,9 +28,6 @@ GraphicsFactory *FactoryRepository::getGraphicsFactory(const string &name){ if(name == "OpenGL"){ return &graphicsFactoryGl; } - else if(name == "OpenGL2"){ - return &graphicsFactoryGl2; - } throw megaglest_runtime_error("Unknown graphics factory: [" + name + "]"); }