Package: caveexpress / 2.4+git20160609-3

use-system-Box2D.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
From: Markus Koschany <apo@debian.org>
Date: Thu, 9 Jun 2016 13:36:11 +0200
Subject: use system Box2D

---
 src/caveexpress/server/entities/IEntity.h | 2 +-
 src/caveexpress/server/map/Map.cpp        | 2 +-
 src/modules/common/CMakeLists.txt         | 2 +-
 src/modules/physics/Box2DMath.h           | 2 +-
 src/modules/physics/DebugRenderer.h       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/caveexpress/server/entities/IEntity.h b/src/caveexpress/server/entities/IEntity.h
index f768fc1..d809a90 100644
--- a/src/caveexpress/server/entities/IEntity.h
+++ b/src/caveexpress/server/entities/IEntity.h
@@ -4,7 +4,7 @@
 #ifndef b2Assert
 #define b2Assert SDL_assert
 #endif
-#include <Box2D.h>
+#include <Box2D/Box2D.h>
 #include "physics/Box2DMath.h"
 #include "common/Log.h"
 #include "common/Timer.h"
diff --git a/src/caveexpress/server/map/Map.cpp b/src/caveexpress/server/map/Map.cpp
index 964b205..6996557 100644
--- a/src/caveexpress/server/map/Map.cpp
+++ b/src/caveexpress/server/map/Map.cpp
@@ -46,7 +46,7 @@
 #include "common/vec2.h"
 #include "common/ExecutionTime.h"
 #include "common/Commands.h"
-#include <Common/b2Settings.h>
+#include <Box2D/Common/b2Settings.h>
 #include <SDL.h>
 #include <SDL_stdinc.h>
 #include <algorithm>
diff --git a/src/modules/common/CMakeLists.txt b/src/modules/common/CMakeLists.txt
index 43aaaf5..de343cd 100644
--- a/src/modules/common/CMakeLists.txt
+++ b/src/modules/common/CMakeLists.txt
@@ -46,4 +46,4 @@ endif()
 
 add_library(common ${common_SRCS} ${ports_SRCS})
 set_target_properties(common PROPERTIES FOLDER common)
-cp_target_link_libraries(TARGET common LIBS ${LUA5.2_LIBRARIES} ${SDL2_LIBRARIES} ${SQLITE3_LIBRARIES} ${BOX2D_LIBRARIES} ${GLM_LIBRARIES} ${CURSES_LIBRARIES})
+cp_target_link_libraries(TARGET common LIBS ${LUA5.2_LIBRARIES} ${SDL2_LIBRARIES} -lsqlite3 -lBox2D ${GLM_LIBRARIES} ${CURSES_LIBRARIES})
diff --git a/src/modules/physics/Box2DMath.h b/src/modules/physics/Box2DMath.h
index 314a2f8..33c5eea 100644
--- a/src/modules/physics/Box2DMath.h
+++ b/src/modules/physics/Box2DMath.h
@@ -6,7 +6,7 @@
 #endif
 #include "common/Compiler.h"
 GCC_DIAG_OFF(shadow)
-#include <Common/b2Math.h>
+#include <Box2D/Common/b2Math.h>
 GCC_DIAG_ON(shadow)
 #include "common/Math.h"
 
diff --git a/src/modules/physics/DebugRenderer.h b/src/modules/physics/DebugRenderer.h
index d7896b0..aaa7bbb 100644
--- a/src/modules/physics/DebugRenderer.h
+++ b/src/modules/physics/DebugRenderer.h
@@ -4,7 +4,7 @@
 #ifndef b2Assert
 #define b2Assert SDL_assert
 #endif
-#include <Box2D.h>
+#include <Box2D/Box2D.h>
 #include "common/IFrontend.h"
 #include "common/Compiler.h"
 #include "common/DebugRendererData.h"