diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-08-16 00:00:57 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-08-16 00:25:36 +0300 |
| commit | b30df9b843eae2128431320308510f13296e3e7f (patch) | |
| tree | aeaebc3595508700e2b7313c2252b446212d25d5 | |
| parent | b5f95469e5e8970407036471a2ae37148f044481 (diff) | |
| download | plus-b30df9b843eae2128431320308510f13296e3e7f.tar.gz plus-b30df9b843eae2128431320308510f13296e3e7f.tar.bz2 plus-b30df9b843eae2128431320308510f13296e3e7f.tar.xz plus-b30df9b843eae2128431320308510f13296e3e7f.zip | |
Fix compilation errors.
| -rw-r--r-- | src/graphicsmanager.cpp | 6 | ||||
| -rw-r--r-- | src/gui/questswindow.h | 1 | ||||
| -rw-r--r-- | src/utils/copynpaste.cpp | 3 |
3 files changed, 9 insertions, 1 deletions
diff --git a/src/graphicsmanager.cpp b/src/graphicsmanager.cpp index 5a02b1776..86814b4be 100644 --- a/src/graphicsmanager.cpp +++ b/src/graphicsmanager.cpp @@ -214,6 +214,7 @@ Graphics *GraphicsManager::createGraphics() void GraphicsManager::updateExtensions() { +#ifdef USE_OPENGL mExtensions.clear(); logger->log1("opengl extensions: "); if (checkGLVersion(3, 0)) @@ -238,10 +239,12 @@ void GraphicsManager::updateExtensions() splitToStringSet(mExtensions, extensions, ' '); } +#endif } void GraphicsManager::updatePlanformExtensions() { +#ifdef USE_OPENGL SDL_SysWMinfo info; SDL_VERSION(&info.version); if (SDL_GetWMInfo(&info)) @@ -315,6 +318,7 @@ void GraphicsManager::updatePlanformExtensions() } #endif } +#endif } bool GraphicsManager::supportExtension(const std::string &ext) @@ -552,6 +556,7 @@ void GraphicsManager::deleteFBO(FBOInfo *fbo) void GraphicsManager::initOpenGLFunctions() { +#ifdef USE_OPENGL if (!checkGLVersion(1, 1)) return; @@ -591,4 +596,5 @@ void GraphicsManager::initOpenGLFunctions() #ifdef WIN32 assignFunction(wglGetExtensionsString, "wglGetExtensionsStringARB"); #endif +#endif } diff --git a/src/gui/questswindow.h b/src/gui/questswindow.h index 0c4d5789e..706f6ba1c 100644 --- a/src/gui/questswindow.h +++ b/src/gui/questswindow.h @@ -30,6 +30,7 @@ #include <guichan/actionlistener.hpp> #include <map> +#include <vector> class Button; class BrowserBox; diff --git a/src/utils/copynpaste.cpp b/src/utils/copynpaste.cpp index 94cfe9589..461de1001 100644 --- a/src/utils/copynpaste.cpp +++ b/src/utils/copynpaste.cpp @@ -33,8 +33,9 @@ # include "config.h" #endif +#include "utils/copynpaste.h" + #include <SDL_syswm.h> -#include "copynpaste.h" #include "debug.h" |