use GLES3, and glm/, update and spread makefile

arena/Cube.h

@@ -19,7 +19,7 @@
 
 #else
 #define GL3_PROTOTYPES 1
-#include <GL3/gl3.h>
+#include <GLES3/gl3.h>
 
 #endif
 

arena/FrameBuffer.h

@@ -13,7 +13,7 @@
 // Include UNIX/Linux
 #else
 #define GL3_PROTOTYPES 1
-#include <GL3/gl3.h>
+#include <GLES3/gl3.h>
 #endif
 
 // Includes communs

arena/SceneOpenGL.h

@@ -14,7 +14,7 @@
 // Include UNIX/Linux
 #else
     #define GL3_PROTOTYPES 1
-    #include <GL3/gl3.h>
+    #include <GLES3/gl3.h>
 
 #endif
 

arena/Shader.h

@@ -13,7 +13,7 @@
 // Include UNIX/Linux
 #else
 #define GL3_PROTOTYPES 1
-#include <GL3/gl3.h>
+#include <GLES3/gl3.h>
 #endif
 
 // Includes communs

arena/Surface3D.h

@@ -7,7 +7,7 @@
 
 #else
 #define GL3_PROTOTYPES 1
-#include <GL3/gl3.h>
+#include <GLES3/gl3.h>
 
 #endif
 

arena/Texture.h

@@ -15,7 +15,7 @@
 // Include UNIX/Linux
 #else
     #define GL3_PROTOTYPES 1
-    #include <GL3/gl3.h>
+    #include <GLES3/gl3.h>
 #endif
 
 // Autres includes

arena/makefile

@@ -0,0 +1,25 @@
+CXX=g++
+CXXFLAGS=
+LDFLAGS=-lSDL2 -lOpenGL
+INC=
+LIB=
+
+EXEC=AppOpenGL
+SRC=$(shell find . -name '*.cpp')
+OBJ=$(SRC:.cpp=.o)
+
+$(EXEC): $(OBJ)
+	@mkdir -p bin
+	$(CXX) -o bin/$@ $^ $(LDFLAGS) $(LIB)
+
+%.o : %.cpp
+	$(CXX) -o $@ -c $< $(CXXFLAGS) $(INC)
+
+clean:
+	rm -rf $(OBJ)
+
+distclean: clean
+	rm -rf ./bin
+
+exec: $(EXEC)
+	./bin/$(EXEC)

caban/Cabane.h

@@ -9,14 +9,14 @@
 
 #else
 #define GL3_PROTOTYPES 1
-#include <GL3/gl3.h>
+#include <GLES3/gl3.h>
 
 #endif
 
 
 // Includes GLM
 
-#include <glm.hpp>
+#include <glm/glm.hpp>
 #include <gtx/transform.hpp>
 #include <gtc/type_ptr.hpp>
 

caban/Camera.h

@@ -4,7 +4,7 @@
 
 // Includes GLM
 
-#include <glm.hpp>
+#include <glm/glm.hpp>
 #include <gtx/transform.hpp>
 #include <gtc/type_ptr.hpp>
 

caban/Cristal.h

@@ -9,14 +9,14 @@
 
 #else
 #define GL3_PROTOTYPES 1
-#include <GL3/gl3.h>
+#include <GLES3/gl3.h>
 
 #endif
 
 
 // Includes GLM
 
-#include <glm.hpp>
+#include <glm/glm.hpp>
 #include <gtx/transform.hpp>
 #include <gtc/type_ptr.hpp>
 

caban/Cube.h

@@ -9,14 +9,14 @@
 
 #else
 #define GL3_PROTOTYPES 1
-#include <GL3/gl3.h>
+#include <GLES3/gl3.h>
 
 #endif
 
 
 // Includes GLM
 
-#include <glm.hpp>
+#include <glm/glm.hpp>
 #include <gtx/transform.hpp>
 #include <gtc/type_ptr.hpp>
 

caban/SceneOpenGL.h

@@ -9,14 +9,14 @@
 
 #else
 #define GL3_PROTOTYPES 1
-#include <GL3/gl3.h>
+#include <GLES3/gl3.h>
 
 #endif
 
 
 // Includes GLM
 
-#include <glm.hpp>
+#include <glm/glm.hpp>
 #include <gtx/transform.hpp>
 #include <gtc/type_ptr.hpp>
 

caban/Shader.h

@@ -19,7 +19,7 @@
 
 #else
 #define GL3_PROTOTYPES 1
-#include <GL3/gl3.h>
+#include <GLES3/gl3.h>
 
 #endif
 

caban/Sol.h

@@ -9,14 +9,14 @@
 
 #else
 #define GL3_PROTOTYPES 1
-#include <GL3/gl3.h>
+#include <GLES3/gl3.h>
 
 #endif
 
 
 // Includes GLM
 
-#include <glm.hpp>
+#include <glm/glm.hpp>
 #include <gtx/transform.hpp>
 #include <gtc/type_ptr.hpp>
 

caban/Texture.h

@@ -14,7 +14,7 @@
 
 #else
 #define GL3_PROTOTYPES 1
-#include <GL3/gl3.h>
+#include <GLES3/gl3.h>
 #include <SDL2/SDL_image.h>
 
 #endif

caban/makefile

@@ -0,0 +1,25 @@
+CXX=g++
+CXXFLAGS=
+LDFLAGS=-lSDL2 -lOpenGL
+INC=
+LIB=
+
+EXEC=AppOpenGL
+SRC=$(shell find . -name '*.cpp')
+OBJ=$(SRC:.cpp=.o)
+
+$(EXEC): $(OBJ)
+	@mkdir -p bin
+	$(CXX) -o bin/$@ $^ $(LDFLAGS) $(LIB)
+
+%.o : %.cpp
+	$(CXX) -o $@ -c $< $(CXXFLAGS) $(INC)
+
+clean:
+	rm -rf $(OBJ)
+
+distclean: clean
+	rm -rf ./bin
+
+exec: $(EXEC)
+	./bin/$(EXEC)

colorCube/ColorCube.h

@@ -8,7 +8,7 @@
 
 #else
 #define GL3_PROTOTYPES 1
-#include <GL/gl.h>
+#include <GLES3/gl3.h>
 #endif
 
 // Includes GLM

colorCube/Mosaic.h

@@ -7,7 +7,7 @@
 
 #else
 #define GL3_PROTOTYPES 1
-#include <GL/gl.h>
+#include <GLES3/gl3.h>
 #endif
 
 // Includes GLM

colorCube/SceneOpenGL.h

@@ -10,7 +10,7 @@
 // Includes OpenGL
 #include <SDL2/SDL.h>
 #define GL3_PROTOTYPES 1
-#include <GL/gl.h>
+#include <GLES3/gl3.h>
 
 //Includes de base
 #include <string>

colorCube/Shader.h

@@ -10,7 +10,7 @@
 // Include Mac ou UNIX/Linux
 #else
 #define GL3_PROTOTYPES 1
-#include <GL/gl.h>
+#include <GLES3/gl3.h>
 
 #endif
 

colorCube/makefile

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

cubeWorld/Cubes/Cube.h

@@ -13,7 +13,7 @@
 // Include UNIX/Linux
 #else
 #define GL3_PROTOTYPES 1
-#include <GL/gl.h>
+#include <GLES3/gl3.h>
 #endif
 
 // Includes GLM

cubeWorld/Cubes/Texture.h

@@ -6,7 +6,7 @@
 #include <GL/glew.h>
 #else
 #define GL3_PROTOTYPES 1
-#include <GL/gl.h>
+#include <GLES3/gl3.h>
 #endif
 
 #include <SDL2/SDL.h>

cubeWorld/SceneOpenGL.h

@@ -10,7 +10,7 @@
 // Includes OpenGL
 #include <SDL2/SDL.h>
 #define GL3_PROTOTYPES 1
-#include <GL/gl.h>
+#include <GLES3/gl3.h>
 
 //Includes de base
 #include <string>

cubeWorld/Shader.h

@@ -13,7 +13,7 @@
 // Include UNIX/Linux
 #else
 #define GL3_PROTOTYPES 1
-#include <GL/gl.h>
+#include <GLES3/gl3.h>
 #endif
 
 // Includes communs

cubeWorld/makefile

@@ -1,10 +1,10 @@
 CXX=g++
 CXXFLAGS=
-LDFLAGS=-lSDL2
+LDFLAGS=-lSDL2 -lOpenGL
 INC=
 LIB=
 
-EXEC=GlApp
+EXEC=AppOpenGL
 SRC=$(shell find . -name '*.cpp')
 OBJ=$(SRC:.cpp=.o)
 

shaderTest/.gitignore

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

shaderTest/ColorCube.h

@@ -8,7 +8,7 @@
 
 #else
 #define GL3_PROTOTYPES 1
-#include <GL3/gl3.h>
+#include <GLES3/gl3.h>
 #endif
 
 // Includes GLM

shaderTest/Mosaic.h

@@ -7,7 +7,7 @@
 
 #else
 #define GL3_PROTOTYPES 1
-#include <GL3/gl3.h>
+#include <GLES3/gl3.h>
 #endif
 
 // Includes GLM

shaderTest/SceneOpenGL.h

@@ -9,7 +9,7 @@
 // Includes OpenGL
 #include <SDL2/SDL.h>
 #define GL3_PROTOTYPES 1
-#include <GL3/gl3.h>
+#include <GLES3/gl3.h>
 
 //Includes de base
 #include <string>

shaderTest/Shader.h

@@ -10,7 +10,7 @@
 // Include Mac ou UNIX/Linux
 #else
 #define GL3_PROTOTYPES 1
-#include <GL3/gl3.h>
+#include <GLES3/gl3.h>
 
 #endif
 

shaderTest/makefile

@@ -0,0 +1,25 @@
+CXX=g++
+CXXFLAGS=
+LDFLAGS=-lSDL2 -lOpenGL
+INC=
+LIB=
+
+EXEC=AppOpenGL
+SRC=$(shell find . -name '*.cpp')
+OBJ=$(SRC:.cpp=.o)
+
+$(EXEC): $(OBJ)
+	@mkdir -p bin
+	$(CXX) -o bin/$@ $^ $(LDFLAGS) $(LIB)
+
+%.o : %.cpp
+	$(CXX) -o $@ -c $< $(CXXFLAGS) $(INC)
+
+clean:
+	rm -rf $(OBJ)
+
+distclean: clean
+	rm -rf ./bin
+
+exec: $(EXEC)
+	./bin/$(EXEC)

textureTest/Cube.h

@@ -9,7 +9,7 @@
 
 #else
 #define GL3_PROTOTYPES 1
-#include <GL3/gl3.h>
+#include <GLES3/gl3.h>
 
 #endif
 

textureTest/SceneOpenGL.h

@@ -9,7 +9,7 @@
 // Includes OpenGL
 #include <SDL2/SDL.h>
 #define GL3_PROTOTYPES 1
-#include <GL3/gl3.h>
+#include <GLES3/gl3.h>
 
 //Includes de base
 #include <string>

textureTest/Shader.h

@@ -19,7 +19,7 @@
 
 #else
 #define GL3_PROTOTYPES 1
-#include <GL3/gl3.h>
+#include <GLES3/gl3.h>
 
 #endif
 

textureTest/Surface3D.h

@@ -7,7 +7,7 @@
 
 #else
 #define GL3_PROTOTYPES 1
-#include <GL3/gl3.h>
+#include <GLES3/gl3.h>
 
 #endif
 

textureTest/Texture.h

@@ -6,7 +6,7 @@
 #include <GL/glew.h>
 #else
 #define GL3_PROTOTYPES 1
-#include <GL3/gl3.h>
+#include <GLES3/gl3.h>
 #endif
 
 #include <SDL2/SDL.h>

textureTest/makefile

@@ -0,0 +1,25 @@
+CXX=g++
+CXXFLAGS=
+LDFLAGS=-lSDL2 -lOpenGL
+INC=
+LIB=
+
+EXEC=AppOpenGL
+SRC=$(shell find . -name '*.cpp')
+OBJ=$(SRC:.cpp=.o)
+
+$(EXEC): $(OBJ)
+	@mkdir -p bin
+	$(CXX) -o bin/$@ $^ $(LDFLAGS) $(LIB)
+
+%.o : %.cpp
+	$(CXX) -o $@ -c $< $(CXXFLAGS) $(INC)
+
+clean:
+	rm -rf $(OBJ)
+
+distclean: clean
+	rm -rf ./bin
+
+exec: $(EXEC)
+	./bin/$(EXEC)