thomas
/
OpenRaider
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Fix glm includes for Travis

Thomas Buck 10 years ago
parent
43a70b7d24
commit
86eb716b47
12 changed files with 16 additions and 20 deletions
Unified View Show Diff Stats
  1. 2
    2
      include/Camera.h
  2. 1
    1
      include/Mesh.h
  3. 1
    1
      include/Render.h
  4. 2
    3
      include/RoomData.h
  5. 1
    1
      include/system/FontTRLE.h
  6. 2
    3
      include/system/Window.h
  7. 1
    1
      src/Camera.cpp
  8. 1
    1
      src/Entity.cpp
  9. 1
    2
      src/Room.cpp
  10. 1
    1
      src/Sprite.cpp
  11. 1
    1
      src/commands/CommandSet.cpp
  12. 2
    3
      src/loader/LoaderTR2.cpp

+ 2
- 2
include/Camera.h View File

8 
 #ifndef _CAMERA_H_
 8 
 #ifndef _CAMERA_H_
9 
 #define _CAMERA_H_
 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 
 class Camera {
 14 
 class Camera {
15 
   public:
 15 
   public:

+ 1
- 1
include/Mesh.h View File

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

+ 1
- 1
include/Render.h View File

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

+ 2
- 3
include/RoomData.h View File

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

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

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

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

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

+ 1
- 1
src/Camera.cpp View File

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

+ 1
- 1
src/Entity.cpp View File

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

+ 1
- 2
src/Room.cpp View File

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

+ 1
- 1
src/Sprite.cpp View File

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

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

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

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

6 
  */
 6 
  */
7
7
8 
 #include <vector>
 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 
 #include "global.h"
 12 
 #include "global.h"
14 
 #include "Game.h"
 13 
 #include "Game.h"

Write Preview
Loading…
Cancel
Save