diff options
author | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2020-07-08 12:46:12 -0300 |
---|---|---|
committer | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2020-07-08 12:46:12 -0300 |
commit | 1d1e0fd1052788c1eaec4b03026d441ad8a031f6 (patch) | |
tree | 7c04e7ac1fbe832e0d3747e670b61b5af3bbbae4 | |
parent | f49c4292cc01006d77dd45febf5b8f01f18c7d75 (diff) | |
download | PSP.git-1d1e0fd1052788c1eaec4b03026d441ad8a031f6.tar.gz PSP.git-1d1e0fd1052788c1eaec4b03026d441ad8a031f6.tar.xz PSP.git-1d1e0fd1052788c1eaec4b03026d441ad8a031f6.zip |
Changes in GLM include
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | Project/Shader.h | 2 | ||||
-rw-r--r-- | Project/Workspace.h | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 274336f..fbb4651 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,6 +39,8 @@ file(GLOB PSP_SRC "Project/fparser/fparser.cc" "Project/fparser/fpoptimizer.cc" "Project/wxMathPlot/*.cpp" + "Project/glm/glm.hpp" + "Project/glm/gtc/matrix_transform.hpp" "Project/glm/*.hpp" "Project/glm/detail/*.hpp" "Project/glm/detail/*.inl" diff --git a/Project/Shader.h b/Project/Shader.h index b4247cc..7c06925 100644 --- a/Project/Shader.h +++ b/Project/Shader.h @@ -5,7 +5,7 @@ #include <unordered_map> #include <wx/string.h> -#include "glm\glm.hpp" +#include "glm/glm.hpp" struct ShaderSource { diff --git a/Project/Workspace.h b/Project/Workspace.h index 4c84655..3576ce3 100644 --- a/Project/Workspace.h +++ b/Project/Workspace.h @@ -33,7 +33,7 @@ #include <wx/tipwin.h> #include <wx/stopwatch.h> -#include "glm\glm.hpp" +#include "glm/glm.hpp" #include "glm/gtc/matrix_transform.hpp" #include "WorkspaceBase.h" |