Merge branch 'fix/caban-build'

Black window but no error.

caban/.gitignore

@@ -0,0 +1 @@
+bin/

caban/Cabane.h

@@ -17,8 +17,9 @@
 // Includes GLM
 
 #include <glm/glm.hpp>
-#include <gtx/transform.hpp>
-#include <gtc/type_ptr.hpp>
+#define GLM_ENABLE_EXPERIMENTAL
+#include <glm/gtx/transform.hpp>
+#include <glm/gtc/type_ptr.hpp>
 
 
 // Autres includes

caban/Camera.h

@@ -5,8 +5,9 @@
 // Includes GLM
 
 #include <glm/glm.hpp>
-#include <gtx/transform.hpp>
-#include <gtc/type_ptr.hpp>
+#define GLM_ENABLE_EXPERIMENTAL
+#include <glm/gtx/transform.hpp>
+#include <glm/gtc/type_ptr.hpp>
 
 
 // Autres includes

caban/Cristal.h

@@ -17,8 +17,9 @@
 // Includes GLM
 
 #include <glm/glm.hpp>
-#include <gtx/transform.hpp>
-#include <gtc/type_ptr.hpp>
+#define GLM_ENABLE_EXPERIMENTAL
+#include <glm/gtx/transform.hpp>
+#include <glm/gtc/type_ptr.hpp>
 
 
 // Autres includes

caban/Cube.h

@@ -17,8 +17,9 @@
 // Includes GLM
 
 #include <glm/glm.hpp>
-#include <gtx/transform.hpp>
-#include <gtc/type_ptr.hpp>
+#define GLM_ENABLE_EXPERIMENTAL
+#include <glm/gtx/transform.hpp>
+#include <glm/gtc/type_ptr.hpp>
 
 
 // Includes

caban/Input.h

@@ -3,7 +3,7 @@
 
 // Include
 
-#include <SDL.h>
+#include <SDL2/SDL.h>
 
 
 // Classe

caban/SceneOpenGL.h

@@ -17,13 +17,14 @@
 // Includes GLM
 
 #include <glm/glm.hpp>
-#include <gtx/transform.hpp>
-#include <gtc/type_ptr.hpp>
+#define GLM_ENABLE_EXPERIMENTAL
+#include <glm/gtx/transform.hpp>
+#include <glm/gtc/type_ptr.hpp>
 
 
 // Autres includes
 
-#include <SDL.h>
+#include <SDL2/SDL.h>
 #include <iostream>
 #include <string>
 #include "Shader.h"

caban/Shaders/texture.frag

@@ -24,5 +24,5 @@ void main()
 {
     // Couleur du pixel
 
-    out_Color = texture(texture, coordTexture);
+    out_Color = texture2D(texture, coordTexture);
 }

caban/Sol.h

@@ -17,8 +17,9 @@
 // Includes GLM
 
 #include <glm/glm.hpp>
-#include <gtx/transform.hpp>
-#include <gtc/type_ptr.hpp>
+#define GLM_ENABLE_EXPERIMENTAL
+#include <glm/gtx/transform.hpp>
+#include <glm/gtc/type_ptr.hpp>
 
 
 // Autres includes

caban/Texture.cpp

@@ -52,7 +52,7 @@ bool Texture::charger()
 {
     // Chargement de l'image dans une surface SDL
 
-    SDL_Surface *imageSDL = SDL_LoadBMP(m_fichierImage.c_str());
+    SDL_Surface *imageSDL = IMG_Load(m_fichierImage.c_str());
 
     if(imageSDL == 0)
     {
@@ -100,11 +100,7 @@ bool Texture::charger()
 
         // Format
 
-        if(imageInversee->format->Rmask == 0xff)
-            format = GL_RGB;
-
-        else
-            format = GL_BGR;
+		format = GL_RGB;
     }
 
 
@@ -119,11 +115,7 @@ bool Texture::charger()
 
         // Format
 
-        if(imageInversee->format->Rmask == 0xff)
-            format = GL_RGBA;
-
-        else
-            format = GL_BGRA;
+		format = GL_RGBA;
     }
 
 

caban/Texture.h

@@ -19,7 +19,7 @@
 
 #endif
 
-#include <SDL.h>
+#include <SDL2/SDL.h>
 #include <iostream>
 #include <string>
 

caban/makefile

@@ -1,6 +1,6 @@
 CXX=g++
 CXXFLAGS=
-LDFLAGS=-lSDL2 -lOpenGL
+LDFLAGS=-lSDL2 -lSDL2_image -lOpenGL
 INC=
 LIB=