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
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
|
Description: Builds against system libs instead of the bundled ones
Should be rewritten properly, But It Works
Forwarded: not-needed
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -12,6 +12,10 @@
target_compile_definitions(code PUBLIC "PDB_DEBUGGING=1")
endif(MSVC)
+INCLUDE_DIRECTORIES("/usr/include/antlr4-runtime/")
+INCLUDE_DIRECTORIES("/usr/include/lua5.1/")
+INCLUDE_DIRECTORIES("/usr/include/SDL2/")
+INCLUDE_DIRECTORIES("/usr/include/imgui/")
TARGET_INCLUDE_DIRECTORIES(code PUBLIC ${CODE_HEADERS})
TARGET_INCLUDE_DIRECTORIES(code PUBLIC ${FREESPACE_HEADERS})
@@ -30,26 +34,22 @@
endif()
TARGET_LINK_LIBRARIES(code PUBLIC openal)
-TARGET_LINK_LIBRARIES(code PUBLIC ${LUA_LIBS})
-TARGET_LINK_LIBRARIES(code PUBLIC ${PNG_LIBS})
-TARGET_LINK_LIBRARIES(code PUBLIC ${JPEG_LIBS})
+TARGET_LINK_LIBRARIES(code PUBLIC lua5.1)
+TARGET_LINK_LIBRARIES(code PUBLIC png)
+TARGET_LINK_LIBRARIES(code PUBLIC jpeg)
TARGET_LINK_LIBRARIES(code PUBLIC lz4)
-TARGET_LINK_LIBRARIES(code PUBLIC sdl2)
+TARGET_LINK_LIBRARIES(code PUBLIC SDL2)
if (FSO_BUILD_WITH_FFMPEG)
TARGET_LINK_LIBRARIES(code PUBLIC ffmpeg)
endif()
-TARGET_LINK_LIBRARIES(code PUBLIC utfcpp)
-
TARGET_LINK_LIBRARIES(code PUBLIC platform)
TARGET_LINK_LIBRARIES(code PUBLIC compiler)
target_link_libraries(code PUBLIC md5)
-target_link_libraries(code PUBLIC discord-rpc)
-
target_link_libraries(code PUBLIC libRocket)
target_link_libraries(code PUBLIC pcp)
@@ -75,10 +75,12 @@
target_link_libraries(code PUBLIC anl)
-target_link_libraries(code PUBLIC hidapi::hidapi)
+target_link_libraries(code PUBLIC hidapi-hidraw)
target_link_libraries(code PUBLIC imgui)
+target_link_libraries(code PUBLIC stb)
+
IF(NOT APPLE)
target_link_libraries(code PUBLIC OpenXR::openxr_loader)
target_include_directories(code PUBLIC OpenXR::Headers)
--- a/code/source_groups.cmake
+++ b/code/source_groups.cmake
@@ -524,8 +524,6 @@
graphics/paths/nanovg/fontstash.h
graphics/paths/nanovg/nanovg.c
graphics/paths/nanovg/nanovg.h
- graphics/paths/nanovg/stb_image.h
- graphics/paths/nanovg/stb_truetype.h
)
# Graphics -> SoftwareGr files
--- a/freespace2/CMakeLists.txt
+++ b/freespace2/CMakeLists.txt
@@ -1,4 +1,7 @@
+INCLUDE_DIRECTORIES("/usr/include/lua5.1/")
+INCLUDE_DIRECTORIES("/usr/include/SDL2/")
+INCLUDE_DIRECTORIES("/usr/include/imgui/")
SET(FREESPACE_SRC freespace.cpp
levelpaging.cpp
@@ -68,6 +71,7 @@ enable_clang_tidy(Freespace2)
INCLUDE(util)
COPY_FILES_TO_TARGET(Freespace2)
+cmake_policy(SET CMP0026 OLD)
include(CreateLaunchers)
create_target_launcher(Freespace2
WORKING_DIRECTORY ${FSO_FREESPACE_PATH}
--- a/parsers/CMakeLists.txt
+++ b/parsers/CMakeLists.txt
@@ -32,7 +32,7 @@
add_library(parsers STATIC)
-target_link_libraries(parsers PUBLIC antlr4_static)
+target_link_libraries(parsers PUBLIC antlr4-runtime)
find_package(ANTLR)
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -1,23 +1,13 @@
include(prebuilt.cmake)
-ADD_SUBDIRECTORY(libjpeg)
-
-ADD_SUBDIRECTORY(zlib)
-
-ADD_SUBDIRECTORY(libpng)
-
-ADD_SUBDIRECTORY(lua)
-
include(OpenAL.cmake)
if (FSO_BUILD_WITH_OPENGL)
add_subdirectory(opengl)
endif()
include(SDL2.cmake)
-
-ADD_SUBDIRECTORY(jansson)
# These are only required for the web-ui which is non-Windows
IF(UNIX)
ADD_SUBDIRECTORY(mongoose)
@@ -25,22 +14,16 @@
add_subdirectory(md5)
-add_subdirectory(utfcpp)
-
include(freetype.cmake)
if (FSO_BUILD_WITH_FFMPEG)
include(FFmpeg.cmake)
endif()
-add_subdirectory(discord)
-
include(libRocket.cmake)
add_subdirectory(libpcp)
-include(antlr4.cmake)
-
include(vulkan.cmake)
add_subdirectory(mdns)
@@ -53,14 +36,6 @@
add_subdirectory(optional)
-ADD_SUBDIRECTORY(lz4)
-
-set(HIDAPI_WITH_LIBUSB OFF)
-set(HIDAPI_WITH_HIDRAW ON)
-add_subdirectory(hidapi)
-
-ADD_SUBDIRECTORY(imgui)
-
if(NOT APPLE)
add_subdirectory(openxr)
endif()
\ Pas de fin de ligne à la fin du fichier
--- a/lib/libRocket.cmake
+++ b/lib/libRocket.cmake
@@ -2,6 +2,7 @@
# Build script for libRocket =======
#===================================
+INCLUDE_DIRECTORIES("/usr/include/lua5.1/")
set(LIBROCKET_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libRocket")
if(COMMAND cmake_policy)
|
