From eb2b5269f9020048312ae8b7eb166fedf3620a32 Mon Sep 17 00:00:00 2001
From: Magnus Norddahl <dpjudas@users.noreply.github.com>
Date: Wed, 25 Jan 2017 03:28:11 +0100
Subject: [PATCH] Fix linux compile errors
---
src/posix/sdl/sdlglvideo.cpp | 2 +-
src/posix/sdl/sdlglvideo.h | 3 +++
src/posix/sdl/sdlvideo.cpp | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/posix/sdl/sdlglvideo.cpp b/src/posix/sdl/sdlglvideo.cpp
index 18f1edf16..576ca570b 100644
--- a/src/posix/sdl/sdlglvideo.cpp
+++ b/src/posix/sdl/sdlglvideo.cpp
@@ -326,7 +326,7 @@ bool SDLGLVideo::InitHardware (bool allowsoftware, int multisample)
// FrameBuffer implementation -----------------------------------------------
SDLGLFB::SDLGLFB (void *, int width, int height, int, int, bool fullscreen, bool bgra)
- : DFrameBuffer (width, height, bgra)
+ : SDLBaseFB (width, height, bgra)
{
int i;
diff --git a/src/posix/sdl/sdlglvideo.h b/src/posix/sdl/sdlglvideo.h
index 7acb0fa1b..c3fde256c 100644
--- a/src/posix/sdl/sdlglvideo.h
+++ b/src/posix/sdl/sdlglvideo.h
@@ -39,7 +39,10 @@ class SDLBaseFB : public DFrameBuffer
{
DECLARE_CLASS(SDLBaseFB, DFrameBuffer)
public:
+ using DFrameBuffer::DFrameBuffer;
virtual SDL_Window *GetSDLWindow() = 0;
+
+ friend class SDLGLVideo;
};
class SDLGLFB : public SDLBaseFB
diff --git a/src/posix/sdl/sdlvideo.cpp b/src/posix/sdl/sdlvideo.cpp
index c88d688a5..8594eb648 100644
--- a/src/posix/sdl/sdlvideo.cpp
+++ b/src/posix/sdl/sdlvideo.cpp
@@ -110,7 +110,7 @@ void ScaleWithAspect (int &w, int &h, int Width, int Height)
// FrameBuffer implementation -----------------------------------------------
SDLFB::SDLFB (int width, int height, bool bgra, bool fullscreen, SDL_Window *oldwin)
- : DFrameBuffer (width, height, bgra)
+ : SDLBaseFB (width, height, bgra)
{
int i;