Fix some more build errors

Author: mls-m5

src/shaderprogram.cpp

@@ -11,11 +11,9 @@
 #include "shaderobject.h"
 #include <GL/gl.h>
 #include <GL/glext.h>
-#include <fstream>
 #include <iostream>
 #include <map>
 #include <memory>
-#include <sstream>
 #include <stdexcept>
 #include <string_view>
 #include <vector>
@@ -123,7 +121,7 @@ void ShaderProgram::link() {
         _program = 0;
     }
 
-    glCall("after created program");
+    glCall((void)"after created program");
 }
 
 void ShaderProgram::unlink() {

src/shaders/plainshader.h

@@ -8,6 +8,7 @@
 #pragma once
 
 // #include "matgui/common-gl.h"
+#include "../lib/sdlpp/include/sdlpp/opengl.hpp"
 #include "glpp/gl-backend.hpp"
 #include "matgui/matgui-constants.h"
 #include "matgui/shaderprogram.h"

src/window.cpp

@@ -7,12 +7,13 @@
 
 #include "matgui/window.h"
 #include "matgui/application.h"
-// #include "matgui/common-gl.h"
 #include "matgui/draw.h"
 #include "windowdata.h"
+#include <SDL2/SDL_video.h>
 #include <iostream>
 
 #include "../lib/sdlpp/include/sdlpp/mouse.hpp"
+#include "../lib/sdlpp/include/sdlpp/opengl.hpp"
 
 using std::cout;
 using std::endl;
@@ -96,11 +97,13 @@ Window::Window(string title, int width, int height, bool resizable) {
     checkSDLError(__LINE__);
 
     // Windows needs to make the context current
-    if (_windowData->context.makeCurrent({_windowData->window})) {
+
+    if (SDL_GL_MakeCurrent(_windowData->window.get(), _windowData->context)) {
         throw std::runtime_error("could not make SDL GL context active");
     }
 
-    cout << "Supported version of OpenGl: " << glGetString(GL_VERSION) << endl;
+    // cout << "Supported version of OpenGl: " << glGetString(GL_VERSION) <<
+    // endl;
 
 #ifdef USING_GLEW
     GLenum err = glewInit();
@@ -126,7 +129,7 @@ Window::~Window() {
 }
 
 void Window::clear() {
-    _windowData->context.makeCurrent(sdl::WindowView{_windowData->window});
+    SDL_GL_MakeCurrent(_windowData->window, _windowData->context);
     auto &color = currentStyle.fill;
     matgui::clear(color.r, color.g, color.b, color.a);
 }

src/windowdata.h

@@ -7,7 +7,6 @@
 
 #pragma once
 
-#include "../lib/sdlpp/include/sdlpp/opengl.hpp"
 #include "../lib/sdlpp/include/sdlpp/window.hpp"
 #include "matgui/window.h"
 #include <SDL2/SDL_video.h> //For SDL_GLContext
@@ -16,7 +15,7 @@ namespace matgui {
 
 struct Window::WindowData {
     sdl::Window window;
-    sdl::gl::Context context;
+    void *context;
     Uint32 windowId = 0;
     //! Invalid: The window needs redrawing (when continuous updates = false)
     bool invalid = true;