From 24934c7823457767855bd0abb249a55b8a8c077d Mon Sep 17 00:00:00 2001
From: dec05eba <dec05eba@protonmail.com>
Date: Sun, 27 May 2018 10:48:07 +0200
Subject: Fix soil include path, fix warning errors

---
 src/RenderBackend/OpenGL/DeviceMemory.cpp | 4 ++++
 src/RenderBackend/OpenGL/Image.cpp        | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/RenderBackend/OpenGL')

diff --git a/src/RenderBackend/OpenGL/DeviceMemory.cpp b/src/RenderBackend/OpenGL/DeviceMemory.cpp
index fb9dec5..0dd3e89 100644
--- a/src/RenderBackend/OpenGL/DeviceMemory.cpp
+++ b/src/RenderBackend/OpenGL/DeviceMemory.cpp
@@ -1,5 +1,6 @@
 #include "../../../include/RenderBackend/OpenGL/DeviceMemory.hpp"
 #include "../../../include/RenderBackend/OpenGL/opengl.hpp"
+#include <cassert>
 
 namespace amalgine
 {
@@ -10,6 +11,7 @@ namespace amalgine
             case DeviceMemory::StorageType::STATIC:     return GL_STATIC_DRAW;
             case DeviceMemory::StorageType::DYNAMIC:    return GL_DYNAMIC_DRAW;
             case DeviceMemory::StorageType::STREAM:     return GL_STREAM_DRAW;
+            default: assert(false); return -1;
         }
     }
     
@@ -18,6 +20,7 @@ namespace amalgine
         switch(primitiveType)
         {
             case DeviceMemory::PrimitiveType::TRIANGLE:     return GL_TRIANGLES;
+            default: assert(false); return -1;
         }
     }
     
@@ -26,6 +29,7 @@ namespace amalgine
         switch(primitiveType)
         {
             case DeviceMemory::PrimitiveType::TRIANGLE:     return 3;
+            default: assert(false); return -1;
         }
     }
     
diff --git a/src/RenderBackend/OpenGL/Image.cpp b/src/RenderBackend/OpenGL/Image.cpp
index ba93a51..128a580 100644
--- a/src/RenderBackend/OpenGL/Image.cpp
+++ b/src/RenderBackend/OpenGL/Image.cpp
@@ -1,5 +1,5 @@
 #include "../../../include/RenderBackend/OpenGL/Image.hpp"
-#include "soil/1.16.0/inc/SOIL/SOIL.h"
+#include <SOIL/SOIL.h>
 
 using namespace std;
 
-- 
cgit v1.2.3