From 316cccc5f76f47f09c16089d98be284b689e057d Mon Sep 17 00:00:00 2001 From: Arnaud MASSERANN Date: Fri, 23 Feb 2018 18:36:25 +0100 Subject: [PATCH] Updated GLFW include path --- CMakeLists.txt | 2 +- common/controls.cpp | 2 +- common/texture.cpp | 2 +- misc05_picking/misc05_picking_BulletPhysics.cpp | 2 +- misc05_picking/misc05_picking_custom.cpp | 2 +- misc05_picking/misc05_picking_slow_easy.cpp | 2 +- playground/playground.cpp | 2 +- tutorial01_first_window/tutorial01.cpp | 2 +- tutorial02_red_triangle/tutorial02.cpp | 2 +- tutorial03_matrices/tutorial03.cpp | 2 +- tutorial04_colored_cube/tutorial04.cpp | 2 +- tutorial05_textured_cube/tutorial05.cpp | 2 +- tutorial06_keyboard_and_mouse/tutorial06.cpp | 2 +- tutorial07_model_loading/tutorial07.cpp | 2 +- tutorial08_basic_shading/tutorial08.cpp | 2 +- tutorial09_vbo_indexing/tutorial09.cpp | 2 +- tutorial09_vbo_indexing/tutorial09_AssImp.cpp | 2 +- tutorial09_vbo_indexing/tutorial09_several_objects.cpp | 2 +- tutorial10_transparency/tutorial10.cpp | 2 +- tutorial11_2d_fonts/tutorial11.cpp | 2 +- tutorial12_extensions/tutorial12.cpp | 2 +- tutorial13_normal_mapping/tutorial13.cpp | 2 +- tutorial14_render_to_texture/tutorial14.cpp | 2 +- tutorial15_lightmaps/tutorial15.cpp | 2 +- tutorial16_shadowmaps/tutorial16.cpp | 2 +- tutorial16_shadowmaps/tutorial16_SimpleVersion.cpp | 2 +- tutorial17_rotations/tutorial17.cpp | 2 +- tutorial18_billboards_and_particles/tutorial18_billboards.cpp | 2 +- tutorial18_billboards_and_particles/tutorial18_particles.cpp | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6dad9a515..810aeed70 100644 --- 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 index c3757e01b..fdf91b3d5 100644 --- a/common/controls.cpp +++ b/common/controls.cpp @@ -1,5 +1,5 @@ // Include GLFW -#include +#include 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 index 98430b577..d939d61bc 100644 --- a/common/texture.cpp +++ b/common/texture.cpp @@ -4,7 +4,7 @@ #include -#include +#include GLuint loadBMP_custom(const char * imagepath){ diff --git a/misc05_picking/misc05_picking_BulletPhysics.cpp b/misc05_picking/misc05_picking_BulletPhysics.cpp index 2765d0aa8..9da5e8c44 100644 --- a/misc05_picking/misc05_picking_BulletPhysics.cpp +++ b/misc05_picking/misc05_picking_BulletPhysics.cpp @@ -8,7 +8,7 @@ #include // Include GLFW -#include +#include GLFWwindow* window; // Include GLM diff --git a/misc05_picking/misc05_picking_custom.cpp b/misc05_picking/misc05_picking_custom.cpp index d61dadc7c..7f21b3f1a 100644 --- a/misc05_picking/misc05_picking_custom.cpp +++ b/misc05_picking/misc05_picking_custom.cpp @@ -8,7 +8,7 @@ #include // Include GLFW -#include +#include GLFWwindow* window; // Include GLM diff --git a/misc05_picking/misc05_picking_slow_easy.cpp b/misc05_picking/misc05_picking_slow_easy.cpp index e134ce62e..f538df318 100644 --- a/misc05_picking/misc05_picking_slow_easy.cpp +++ b/misc05_picking/misc05_picking_slow_easy.cpp @@ -8,7 +8,7 @@ #include // Include GLFW -#include +#include GLFWwindow* window; // Include GLM diff --git a/playground/playground.cpp b/playground/playground.cpp index 9c8346a16..2835616a1 100644 --- a/playground/playground.cpp +++ b/playground/playground.cpp @@ -3,7 +3,7 @@ #include -#include +#include GLFWwindow* window; #include diff --git a/tutorial01_first_window/tutorial01.cpp b/tutorial01_first_window/tutorial01.cpp index 44c9c179e..fcf09245e 100644 --- a/tutorial01_first_window/tutorial01.cpp +++ b/tutorial01_first_window/tutorial01.cpp @@ -6,7 +6,7 @@ #include // Include GLFW -#include +#include GLFWwindow* window; // Include GLM diff --git a/tutorial02_red_triangle/tutorial02.cpp b/tutorial02_red_triangle/tutorial02.cpp index 1887ab5c1..d9db11e4c 100644 --- a/tutorial02_red_triangle/tutorial02.cpp +++ b/tutorial02_red_triangle/tutorial02.cpp @@ -6,7 +6,7 @@ #include // Include GLFW -#include +#include GLFWwindow* window; // Include GLM diff --git a/tutorial03_matrices/tutorial03.cpp b/tutorial03_matrices/tutorial03.cpp index b08723b3c..f92294b36 100644 --- a/tutorial03_matrices/tutorial03.cpp +++ b/tutorial03_matrices/tutorial03.cpp @@ -6,7 +6,7 @@ #include // Include GLFW -#include +#include GLFWwindow* window; // Include GLM diff --git a/tutorial04_colored_cube/tutorial04.cpp b/tutorial04_colored_cube/tutorial04.cpp index a5baaa7a4..2587ed2d4 100644 --- a/tutorial04_colored_cube/tutorial04.cpp +++ b/tutorial04_colored_cube/tutorial04.cpp @@ -6,7 +6,7 @@ #include // Include GLFW -#include +#include GLFWwindow* window; // Include GLM diff --git a/tutorial05_textured_cube/tutorial05.cpp b/tutorial05_textured_cube/tutorial05.cpp index cff6f50e1..15f3a0193 100644 --- a/tutorial05_textured_cube/tutorial05.cpp +++ b/tutorial05_textured_cube/tutorial05.cpp @@ -6,7 +6,7 @@ #include // Include GLFW -#include +#include GLFWwindow* window; // Include GLM diff --git a/tutorial06_keyboard_and_mouse/tutorial06.cpp b/tutorial06_keyboard_and_mouse/tutorial06.cpp index 461075858..0c4646656 100644 --- a/tutorial06_keyboard_and_mouse/tutorial06.cpp +++ b/tutorial06_keyboard_and_mouse/tutorial06.cpp @@ -6,7 +6,7 @@ #include // Include GLFW -#include +#include GLFWwindow* window; // Include GLM diff --git a/tutorial07_model_loading/tutorial07.cpp b/tutorial07_model_loading/tutorial07.cpp index 4d1d933a9..f284e6438 100644 --- a/tutorial07_model_loading/tutorial07.cpp +++ b/tutorial07_model_loading/tutorial07.cpp @@ -7,7 +7,7 @@ #include // Include GLFW -#include +#include GLFWwindow* window; // Include GLM diff --git a/tutorial08_basic_shading/tutorial08.cpp b/tutorial08_basic_shading/tutorial08.cpp index ca67710c2..7a9eda0cf 100644 --- a/tutorial08_basic_shading/tutorial08.cpp +++ b/tutorial08_basic_shading/tutorial08.cpp @@ -7,7 +7,7 @@ #include // Include GLFW -#include +#include GLFWwindow* window; // Include GLM diff --git a/tutorial09_vbo_indexing/tutorial09.cpp b/tutorial09_vbo_indexing/tutorial09.cpp index 3a726760b..7838cee31 100644 --- a/tutorial09_vbo_indexing/tutorial09.cpp +++ b/tutorial09_vbo_indexing/tutorial09.cpp @@ -7,7 +7,7 @@ #include // Include GLFW -#include +#include GLFWwindow* window; // Include GLM diff --git a/tutorial09_vbo_indexing/tutorial09_AssImp.cpp b/tutorial09_vbo_indexing/tutorial09_AssImp.cpp index 6107590e0..83a5358f2 100644 --- a/tutorial09_vbo_indexing/tutorial09_AssImp.cpp +++ b/tutorial09_vbo_indexing/tutorial09_AssImp.cpp @@ -7,7 +7,7 @@ #include // Include GLFW -#include +#include GLFWwindow* window; // Include GLM diff --git a/tutorial09_vbo_indexing/tutorial09_several_objects.cpp b/tutorial09_vbo_indexing/tutorial09_several_objects.cpp index 2b12819f6..260958d97 100644 --- a/tutorial09_vbo_indexing/tutorial09_several_objects.cpp +++ b/tutorial09_vbo_indexing/tutorial09_several_objects.cpp @@ -7,7 +7,7 @@ #include // Include GLFW -#include +#include GLFWwindow* window; // Include GLM diff --git a/tutorial10_transparency/tutorial10.cpp b/tutorial10_transparency/tutorial10.cpp index 6aed5df15..078696b72 100644 --- a/tutorial10_transparency/tutorial10.cpp +++ b/tutorial10_transparency/tutorial10.cpp @@ -7,7 +7,7 @@ #include // Include GLFW -#include +#include GLFWwindow* window; // Include GLM diff --git a/tutorial11_2d_fonts/tutorial11.cpp b/tutorial11_2d_fonts/tutorial11.cpp index 7b6b0560f..333b21db8 100644 --- a/tutorial11_2d_fonts/tutorial11.cpp +++ b/tutorial11_2d_fonts/tutorial11.cpp @@ -7,7 +7,7 @@ #include // Include GLFW -#include +#include GLFWwindow* window; // Include GLM diff --git a/tutorial12_extensions/tutorial12.cpp b/tutorial12_extensions/tutorial12.cpp index ae09058ab..3cfb1daed 100644 --- a/tutorial12_extensions/tutorial12.cpp +++ b/tutorial12_extensions/tutorial12.cpp @@ -7,7 +7,7 @@ #include // Include GLFW -#include +#include GLFWwindow* window; // Include GLM diff --git a/tutorial13_normal_mapping/tutorial13.cpp b/tutorial13_normal_mapping/tutorial13.cpp index 9845037d4..17304b010 100644 --- a/tutorial13_normal_mapping/tutorial13.cpp +++ b/tutorial13_normal_mapping/tutorial13.cpp @@ -7,7 +7,7 @@ #include // Include GLFW -#include +#include GLFWwindow* window; // Include GLM diff --git a/tutorial14_render_to_texture/tutorial14.cpp b/tutorial14_render_to_texture/tutorial14.cpp index d6521e7d3..6592a28eb 100644 --- a/tutorial14_render_to_texture/tutorial14.cpp +++ b/tutorial14_render_to_texture/tutorial14.cpp @@ -7,7 +7,7 @@ #include // Include GLFW -#include +#include GLFWwindow* window; // Include GLM diff --git a/tutorial15_lightmaps/tutorial15.cpp b/tutorial15_lightmaps/tutorial15.cpp index 199096cb8..9a75155eb 100644 --- a/tutorial15_lightmaps/tutorial15.cpp +++ b/tutorial15_lightmaps/tutorial15.cpp @@ -7,7 +7,7 @@ #include // Include GLFW -#include +#include GLFWwindow* window; // Include GLM diff --git a/tutorial16_shadowmaps/tutorial16.cpp b/tutorial16_shadowmaps/tutorial16.cpp index c8b672cfc..223c3afc7 100644 --- a/tutorial16_shadowmaps/tutorial16.cpp +++ b/tutorial16_shadowmaps/tutorial16.cpp @@ -7,7 +7,7 @@ #include // Include GLFW -#include +#include GLFWwindow* window; // Include GLM diff --git a/tutorial16_shadowmaps/tutorial16_SimpleVersion.cpp b/tutorial16_shadowmaps/tutorial16_SimpleVersion.cpp index 347966cd7..bb46f1563 100644 --- a/tutorial16_shadowmaps/tutorial16_SimpleVersion.cpp +++ b/tutorial16_shadowmaps/tutorial16_SimpleVersion.cpp @@ -7,7 +7,7 @@ #include // Include GLFW -#include +#include GLFWwindow* window; // Include GLM diff --git a/tutorial17_rotations/tutorial17.cpp b/tutorial17_rotations/tutorial17.cpp index 8772a29d7..cc8cfe58c 100644 --- a/tutorial17_rotations/tutorial17.cpp +++ b/tutorial17_rotations/tutorial17.cpp @@ -7,7 +7,7 @@ #include // Include GLFW -#include +#include GLFWwindow* window; // Include GLM diff --git a/tutorial18_billboards_and_particles/tutorial18_billboards.cpp b/tutorial18_billboards_and_particles/tutorial18_billboards.cpp index 0eca4e08f..99c503249 100644 --- a/tutorial18_billboards_and_particles/tutorial18_billboards.cpp +++ b/tutorial18_billboards_and_particles/tutorial18_billboards.cpp @@ -6,7 +6,7 @@ #include -#include +#include GLFWwindow* window; #include diff --git a/tutorial18_billboards_and_particles/tutorial18_particles.cpp b/tutorial18_billboards_and_particles/tutorial18_particles.cpp index 130970e5f..14a352291 100644 --- a/tutorial18_billboards_and_particles/tutorial18_particles.cpp +++ b/tutorial18_billboards_and_particles/tutorial18_particles.cpp @@ -6,7 +6,7 @@ #include -#include +#include GLFWwindow* window; #include