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
75
76
77
78
79
80
81
|
Description: Make build use system libraries instead of embedded ones,
also removed from tarball.
Author: Gabriele Giacone <1o5g4r8o@gmail.com>
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,8 +41,7 @@ ENDIF (WIN32)
SET(INSTALL_LIBS OFF) # THIS DOESNT WORK THE FIRST TIME AFTER REMOVING CMAKECACHE, ALTERED BULLETS CMAKELISTS.TXT:783
# SET(INSTALL_EXTRA_LIBS OFF)
- include_directories( dependencies/bullet dependencies/bullet/src )
- add_subdirectory( dependencies/bullet )
+ include_directories( /usr/include/bullet )
# ADD_DEFINITIONS( " -Ldependencies/bullet/src/BulletCollision -Bstatic -lLinearMath -lBulletMultiThreaded -lBulletDynamics -lBulletCollision" )
@@ -57,16 +56,12 @@ ENDIF (WIN32)
# add_subdirectory( dependencies/boost/boost )
PROJECT(tinyxml)
-include_directories(dependencies/tinyxml)
-add_subdirectory(dependencies/tinyxml)
PROJECT(glew)
# IF(WIN32)
add_definitions(-DGLEW_STATIC)
# ENDIF(WIN32)
-include_directories(dependencies/glew)
-add_subdirectory(dependencies/glew)
@@ -273,7 +268,7 @@ LINK_DIRECTORIES (
${bengine_LIBS_DIRS}
)
-SET(bengine_INCLUDES "${CMAKE_SOURCE_DIR};dependencies/bullet;dependencies/tinyxml;dependencies/;${FREETYPE_INCLUDE_DIRS};./${bengine_WIN32INCL}")
+SET(bengine_INCLUDES "${CMAKE_SOURCE_DIR};${FREETYPE_INCLUDE_DIRS};./${bengine_WIN32INCL}")
# SET(bengine_INCLUDES "${CMAKE_SOURCE_DIR}/ ./ src/utils/bullet")
# MESSAGE(${bengine_INCLUDES})
--- a/src/graphics/be_graphics_system.h
+++ b/src/graphics/be_graphics_system.h
@@ -14,7 +14,7 @@
#include "src/math/vector3f.h"
#include "src/math/vector4f.h"
-#include "tinyxml/tinyxml.h"
+#include "tinyxml.h"
#include "common/be_xml_helper.h"
#include "resource/be_texture_2d_resource.h"
--- a/src/graphics/CMakeLists.txt
+++ b/src/graphics/CMakeLists.txt
@@ -15,4 +15,4 @@ set(gl_STAT_SRCS
)
add_library(graphics STATIC ${gl_STAT_SRCS})
-target_link_libraries( graphics gl glew utils common math )
+target_link_libraries( graphics gl GLEW utils common math )
--- a/src/utils/CMakeLists.txt
+++ b/src/utils/CMakeLists.txt
@@ -1,6 +1,5 @@
include_directories( ${bengine_INCLUDES} )
-add_subdirectory(ftgl)
set(utils_STAT_SRCS
settings.cpp
--- a/src/gui/textprinter.cpp
+++ b/src/gui/textprinter.cpp
@@ -2,7 +2,7 @@
#include <GL/glew.h>
#include <iostream>
#include "math/vector2i.h"
-#include "utils/ftgl/FTGL/ftgl.h"
+#include "FTGL/ftgl.h"
#include "filesystem/be_filesystem.h"
|
