Updated GLFW include path

loriebi · Feb 23, 2018 · 316cccc · 316cccc
1 parent e596f02
commit 316cccc
Show file tree

Hide file tree

Showing 29 changed files with 29 additions and 29 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -34,7 +34,7 @@ endif(INCLUDE_DISTRIB)
 
 include_directories(
 	external/AntTweakBar-1.16/include/
-	external/glfw-3.1.2/include/GLFW/
+	external/glfw-3.1.2/include/
 	external/glm-0.9.7.1/
 	external/glew-1.13.0/include/
 	external/assimp-3.0.1270/include/

diff --git a/common/controls.cpp b/common/controls.cpp
@@ -1,5 +1,5 @@
 // Include GLFW
-#include <glfw3.h>
+#include <GLFW/glfw3.h>
 extern GLFWwindow* window; // The "extern" keyword here is to access the variable "window" declared in tutorialXXX.cpp. This is a hack to keep the tutorials simple. Please avoid this.
 
 // Include GLM

diff --git a/common/texture.cpp b/common/texture.cpp
@@ -4,7 +4,7 @@
 
 #include <GL/glew.h>
 
-#include <glfw3.h>
+#include <GLFW/glfw3.h>
 
 
 GLuint loadBMP_custom(const char * imagepath){

diff --git a/misc05_picking/misc05_picking_BulletPhysics.cpp b/misc05_picking/misc05_picking_BulletPhysics.cpp
@@ -8,7 +8,7 @@
 #include <GL/glew.h>
 
 // Include GLFW
-#include <glfw3.h>
+#include <GLFW/glfw3.h>
 GLFWwindow* window;
 
 // Include GLM

diff --git a/misc05_picking/misc05_picking_custom.cpp b/misc05_picking/misc05_picking_custom.cpp
@@ -8,7 +8,7 @@
 #include <GL/glew.h>
 
 // Include GLFW
-#include <glfw3.h>
+#include <GLFW/glfw3.h>
 GLFWwindow* window;
 
 // Include GLM

diff --git a/misc05_picking/misc05_picking_slow_easy.cpp b/misc05_picking/misc05_picking_slow_easy.cpp
@@ -8,7 +8,7 @@
 #include <GL/glew.h>
 
 // Include GLFW
-#include <glfw3.h>
+#include <GLFW/glfw3.h>
 GLFWwindow* window;
 
 // Include GLM

diff --git a/playground/playground.cpp b/playground/playground.cpp
@@ -3,7 +3,7 @@
 
 #include <GL/glew.h>
 
-#include <glfw3.h>
+#include <GLFW/glfw3.h>
 GLFWwindow* window;
 
 #include <glm/glm.hpp>

diff --git a/tutorial01_first_window/tutorial01.cpp b/tutorial01_first_window/tutorial01.cpp
@@ -6,7 +6,7 @@
 #include <GL/glew.h>
 
 // Include GLFW
-#include <glfw3.h>
+#include <GLFW/glfw3.h>
 GLFWwindow* window;
 
 // Include GLM

diff --git a/tutorial02_red_triangle/tutorial02.cpp b/tutorial02_red_triangle/tutorial02.cpp
@@ -6,7 +6,7 @@
 #include <GL/glew.h>
 
 // Include GLFW
-#include <glfw3.h>
+#include <GLFW/glfw3.h>
 GLFWwindow* window;
 
 // Include GLM

diff --git a/tutorial03_matrices/tutorial03.cpp b/tutorial03_matrices/tutorial03.cpp
@@ -6,7 +6,7 @@
 #include <GL/glew.h>
 
 // Include GLFW
-#include <glfw3.h>
+#include <GLFW/glfw3.h>
 GLFWwindow* window;
 
 // Include GLM

diff --git a/tutorial04_colored_cube/tutorial04.cpp b/tutorial04_colored_cube/tutorial04.cpp
@@ -6,7 +6,7 @@
 #include <GL/glew.h>
 
 // Include GLFW
-#include <glfw3.h>
+#include <GLFW/glfw3.h>
 GLFWwindow* window;
 
 // Include GLM

diff --git a/tutorial05_textured_cube/tutorial05.cpp b/tutorial05_textured_cube/tutorial05.cpp
@@ -6,7 +6,7 @@
 #include <GL/glew.h>
 
 // Include GLFW
-#include <glfw3.h>
+#include <GLFW/glfw3.h>
 GLFWwindow* window;
 
 // Include GLM

diff --git a/tutorial06_keyboard_and_mouse/tutorial06.cpp b/tutorial06_keyboard_and_mouse/tutorial06.cpp
@@ -6,7 +6,7 @@
 #include <GL/glew.h>
 
 // Include GLFW
-#include <glfw3.h>
+#include <GLFW/glfw3.h>
 GLFWwindow* window;
 
 // Include GLM

diff --git a/tutorial07_model_loading/tutorial07.cpp b/tutorial07_model_loading/tutorial07.cpp
@@ -7,7 +7,7 @@
 #include <GL/glew.h>
 
 // Include GLFW
-#include <glfw3.h>
+#include <GLFW/glfw3.h>
 GLFWwindow* window;
 
 // Include GLM

diff --git a/tutorial08_basic_shading/tutorial08.cpp b/tutorial08_basic_shading/tutorial08.cpp
@@ -7,7 +7,7 @@
 #include <GL/glew.h>
 
 // Include GLFW
-#include <glfw3.h>
+#include <GLFW/glfw3.h>
 GLFWwindow* window;
 
 // Include GLM

diff --git a/tutorial09_vbo_indexing/tutorial09.cpp b/tutorial09_vbo_indexing/tutorial09.cpp
@@ -7,7 +7,7 @@
 #include <GL/glew.h>
 
 // Include GLFW
-#include <glfw3.h>
+#include <GLFW/glfw3.h>
 GLFWwindow* window;
 
 // Include GLM

diff --git a/tutorial09_vbo_indexing/tutorial09_AssImp.cpp b/tutorial09_vbo_indexing/tutorial09_AssImp.cpp
@@ -7,7 +7,7 @@
 #include <GL/glew.h>
 
 // Include GLFW
-#include <glfw3.h>
+#include <GLFW/glfw3.h>
 GLFWwindow* window;
 
 // Include GLM

diff --git a/tutorial09_vbo_indexing/tutorial09_several_objects.cpp b/tutorial09_vbo_indexing/tutorial09_several_objects.cpp
@@ -7,7 +7,7 @@
 #include <GL/glew.h>
 
 // Include GLFW
-#include <glfw3.h>
+#include <GLFW/glfw3.h>
 GLFWwindow* window;
 
 // Include GLM

diff --git a/tutorial10_transparency/tutorial10.cpp b/tutorial10_transparency/tutorial10.cpp
@@ -7,7 +7,7 @@
 #include <GL/glew.h>
 
 // Include GLFW
-#include <glfw3.h>
+#include <GLFW/glfw3.h>
 GLFWwindow* window;
 
 // Include GLM

diff --git a/tutorial11_2d_fonts/tutorial11.cpp b/tutorial11_2d_fonts/tutorial11.cpp
@@ -7,7 +7,7 @@
 #include <GL/glew.h>
 
 // Include GLFW
-#include <glfw3.h>
+#include <GLFW/glfw3.h>
 GLFWwindow* window;
 
 // Include GLM

diff --git a/tutorial12_extensions/tutorial12.cpp b/tutorial12_extensions/tutorial12.cpp
@@ -7,7 +7,7 @@
 #include <GL/glew.h>
 
 // Include GLFW
-#include <glfw3.h>
+#include <GLFW/glfw3.h>
 GLFWwindow* window;
 
 // Include GLM

diff --git a/tutorial13_normal_mapping/tutorial13.cpp b/tutorial13_normal_mapping/tutorial13.cpp
@@ -7,7 +7,7 @@
 #include <GL/glew.h>
 
 // Include GLFW
-#include <glfw3.h>
+#include <GLFW/glfw3.h>
 GLFWwindow* window;
 
 // Include GLM

diff --git a/tutorial14_render_to_texture/tutorial14.cpp b/tutorial14_render_to_texture/tutorial14.cpp
@@ -7,7 +7,7 @@
 #include <GL/glew.h>
 
 // Include GLFW
-#include <glfw3.h>
+#include <GLFW/glfw3.h>
 GLFWwindow* window;
 
 // Include GLM

diff --git a/tutorial15_lightmaps/tutorial15.cpp b/tutorial15_lightmaps/tutorial15.cpp
@@ -7,7 +7,7 @@
 #include <GL/glew.h>
 
 // Include GLFW
-#include <glfw3.h>
+#include <GLFW/glfw3.h>
 GLFWwindow* window;
 
 // Include GLM

diff --git a/tutorial16_shadowmaps/tutorial16.cpp b/tutorial16_shadowmaps/tutorial16.cpp
@@ -7,7 +7,7 @@
 #include <GL/glew.h>
 
 // Include GLFW
-#include <glfw3.h>
+#include <GLFW/glfw3.h>
 GLFWwindow* window;
 
 // Include GLM

diff --git a/tutorial16_shadowmaps/tutorial16_SimpleVersion.cpp b/tutorial16_shadowmaps/tutorial16_SimpleVersion.cpp
@@ -7,7 +7,7 @@
 #include <GL/glew.h>
 
 // Include GLFW
-#include <glfw3.h>
+#include <GLFW/glfw3.h>
 GLFWwindow* window;
 
 // Include GLM

diff --git a/tutorial17_rotations/tutorial17.cpp b/tutorial17_rotations/tutorial17.cpp
@@ -7,7 +7,7 @@
 #include <GL/glew.h>
 
 // Include GLFW
-#include <glfw3.h>
+#include <GLFW/glfw3.h>
 GLFWwindow* window;
 
 // Include GLM

diff --git a/tutorial18_billboards_and_particles/tutorial18_billboards.cpp b/tutorial18_billboards_and_particles/tutorial18_billboards.cpp
@@ -6,7 +6,7 @@
 
 #include <GL/glew.h>
 
-#include <glfw3.h>
+#include <GLFW/glfw3.h>
 GLFWwindow* window;
 
 #include <glm/glm.hpp>

diff --git a/tutorial18_billboards_and_particles/tutorial18_particles.cpp b/tutorial18_billboards_and_particles/tutorial18_particles.cpp
@@ -6,7 +6,7 @@
 
 #include <GL/glew.h>
 
-#include <glfw3.h>
+#include <GLFW/glfw3.h>
 GLFWwindow* window;
 
 #include <glm/glm.hpp>