Removed gl driver setting

ChangeLog.md

@@ -2,10 +2,14 @@
 
 ## OpenRaider (0.1.3) xythobuz <xythobuz@xythobuz.de>
 
-	[ 20140702 ]
-	* Compiled successfully in Windows 7 using MinGW
-	* Added Windows setup script
-	* FontTRLE lps parser no longer using std::stoi
+    [ 20140703 ]
+    * Removed SDL_GL_LoadLibrary() call and corresponding
+      config file entry
+
+    [ 20140702 ]
+    * Compiled successfully in Windows 7 using MinGW
+    * Added Windows setup script
+    * FontTRLE lps parser no longer using std::stoi
 
     [ 20140626 ]
     * ColorMode enum now global

data/OpenRaider.ini

@@ -8,9 +8,6 @@ set datadir    "$(basedir)/data"
 set font       "$(datadir)/test.ttf"
 # set font       "$(datadir)/font.pc"
 
-# Not needed for Mac OS X
-set gldriver   "/usr/lib/libGL.so.1"
-
 # Windowing
 set size       1280 720
 set fullscreen false

include/Window.h

@@ -37,8 +37,6 @@ public:
 
     virtual void swapBuffersGL() = 0;
 
-    virtual void setDriver(const char *driver);
-
     virtual unsigned int getWidth();
 
     virtual unsigned int getHeight();
@@ -53,7 +51,6 @@ public:
 
 protected:
     bool mInit;
-    char *mDriver;
     bool mFullscreen;
     bool mMousegrab;
     unsigned int mWidth;

src/Command.cpp

@@ -414,7 +414,6 @@ int OpenRaider::help(std::string &cmd) {
         getConsole().print("  audiodir   STRING");
         getConsole().print("  datadir    STRING");
         getConsole().print("  font       STRING");
-        getConsole().print("  gldriver   STRING");
         getConsole().print("  size       INT INT");
         getConsole().print("  fullscreen BOOL");
         getConsole().print("  audio      BOOL");
@@ -546,10 +545,6 @@ int OpenRaider::set(std::istream &command) {
             return -3;
         }
         getWindow().setFullscreen(fullscreen);
-    } else if (var.compare("gldriver") == 0) {
-        std::string driver;
-        command >> driver;
-        getWindow().setDriver(driver.c_str());
     } else if (var.compare("audio") == 0) {
         bool audio = false;
         if (!(command >> audio)) {

src/Window.cpp

@@ -15,8 +15,6 @@
 #include "Window.h"
 
 Window::~Window() {
-    if (mDriver)
-        delete [] mDriver;
 }
 
 unsigned int Window::getWidth() {
@@ -27,14 +25,6 @@ unsigned int Window::getHeight() {
     return mHeight;
 }
 
-void Window::setDriver(const char *driver) {
-    assert(driver != NULL);
-    assert(driver[0] != '\0');
-    assert(mInit == false);
-
-    mDriver = bufferString("%s", driver);
-}
-
 int Window::initializeGL() {
     // Print driver support information
     //printf("GL Vendor  : %s\n", glGetString(GL_VENDOR));

src/WindowSDL.cpp

@@ -16,7 +16,6 @@
 
 WindowSDL::WindowSDL() {
     mInit = false;
-    mDriver = NULL;
     mWidth = DEFAULT_WIDTH;
     mHeight = DEFAULT_HEIGHT;
     mFullscreen = false;
@@ -84,18 +83,6 @@ int WindowSDL::initialize() {
         return -1;
     }
 
-#if !(defined(__APPLE__) || defined(_WIN32))
-    assert(mDriver != NULL);
-    assert(mDriver[0] != '\0');
-
-    if (SDL_GL_LoadLibrary(mDriver) < 0) {
-        SDL_ClearError();
-        printf("Could not load OpenGL driver!\n");
-        printf("SDL_GL_LoadLibrary Error: %s\n", SDL_GetError());
-        return -2;
-    }
-#endif
-
     int flags = SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE;
     if (mFullscreen)
         flags |= SDL_WINDOW_FULLSCREEN;