Browse Source

Fix glm includes for Travis

Thomas Buck 10 years ago
parent
commit
86eb716b47

+ 2
- 2
include/Camera.h View File

@@ -8,8 +8,8 @@
8 8
 #ifndef _CAMERA_H_
9 9
 #define _CAMERA_H_
10 10
 
11
-#include "glm/vec3.hpp"
12
-#include "glm/mat4x4.hpp"
11
+#include <glm/vec3.hpp>
12
+#include <glm/mat4x4.hpp>
13 13
 
14 14
 class Camera {
15 15
   public:

+ 1
- 1
include/Mesh.h View File

@@ -10,7 +10,7 @@
10 10
 #ifndef _MESH_H_
11 11
 #define _MESH_H_
12 12
 
13
-#include "glm/vec3.hpp"
13
+#include <glm/vec3.hpp>
14 14
 
15 15
 /*!
16 16
  * \brief OpenGL Mesh

+ 1
- 1
include/Render.h View File

@@ -9,7 +9,7 @@
9 9
 #ifndef _RENDER_H_
10 10
 #define _RENDER_H_
11 11
 
12
-#include "glm/vec4.hpp"
12
+#include <glm/vec4.hpp>
13 13
 
14 14
 #include "TextureManager.h"
15 15
 

+ 2
- 3
include/RoomData.h View File

@@ -8,10 +8,9 @@
8 8
 #ifndef _ROOM_DATA_H_
9 9
 #define _ROOM_DATA_H_
10 10
 
11
-#include "glm/vec3.hpp"
12
-
13
-#include <vector>
14 11
 #include <memory>
12
+#include <vector>
13
+#include <glm/vec3.hpp>
15 14
 
16 15
 class BoundingBox {
17 16
   public:

+ 1
- 1
include/system/FontTRLE.h View File

@@ -8,8 +8,8 @@
8 8
 #ifndef _FONT_TRLE_H_
9 9
 #define _FONT_TRLE_H_
10 10
 
11
-#include "glm/vec2.hpp"
12 11
 #include <vector>
12
+#include <glm/vec2.hpp>
13 13
 
14 14
 /*!
15 15
  * \brief Tomb Raider Level Editor Font loader

+ 2
- 3
include/system/Window.h View File

@@ -8,10 +8,9 @@
8 8
 #ifndef _WINDOW_H_
9 9
 #define _WINDOW_H_
10 10
 
11
-#include "glm/vec2.hpp"
12
-#include "glm/vec4.hpp"
13
-
14 11
 #include <vector>
12
+#include <glm/vec2.hpp>
13
+#include <glm/vec4.hpp>
15 14
 
16 15
 class Shader {
17 16
   public:

+ 1
- 1
src/Camera.cpp View File

@@ -6,7 +6,7 @@
6 6
  * \author xythobuz
7 7
  */
8 8
 
9
-#include "glm/gtc/matrix_transform.hpp"
9
+#include <glm/gtc/matrix_transform.hpp>
10 10
 
11 11
 #include "global.h"
12 12
 #include "Camera.h"

+ 1
- 1
src/Entity.cpp View File

@@ -5,7 +5,7 @@
5 5
  * \author xythobuz
6 6
  */
7 7
 
8
-#include "glm/glm.hpp"
8
+#include <glm/glm.hpp>
9 9
 
10 10
 #include "global.h"
11 11
 #include "Log.h"

+ 1
- 2
src/Room.cpp View File

@@ -5,9 +5,8 @@
5 5
  * \author xythobuz
6 6
  */
7 7
 
8
-#include "glm/gtx/intersect.hpp"
9
-
10 8
 #include <algorithm>
9
+#include <glm/gtx/intersect.hpp>
11 10
 
12 11
 #include "global.h"
13 12
 #include "Game.h"

+ 1
- 1
src/Sprite.cpp View File

@@ -5,7 +5,7 @@
5 5
  * \author xythobuz
6 6
  */
7 7
 
8
-#include "glm/glm.hpp"
8
+#include <glm/glm.hpp>
9 9
 
10 10
 #include "global.h"
11 11
 #include "Camera.h"

+ 1
- 1
src/commands/CommandSet.cpp View File

@@ -5,7 +5,7 @@
5 5
  * \author xythobuz
6 6
  */
7 7
 
8
-#include "glm/glm.hpp"
8
+#include <glm/glm.hpp>
9 9
 
10 10
 #include "global.h"
11 11
 #include "Camera.h"

+ 2
- 3
src/loader/LoaderTR2.cpp View File

@@ -6,9 +6,8 @@
6 6
  */
7 7
 
8 8
 #include <vector>
9
-
10
-#include "glm/glm.hpp"
11
-#include "glm/gtc/matrix_transform.hpp"
9
+#include <glm/glm.hpp>
10
+#include <glm/gtc/matrix_transform.hpp>
12 11
 
13 12
 #include "global.h"
14 13
 #include "Game.h"

Loading…
Cancel
Save