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
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
|
From f72e7b1cccdeaec9ff472f45df06bd91b8b419ec Mon Sep 17 00:00:00 2001
From: David Hummel <hummeltech@sherpaguru.com>
Date: Wed, 21 May 2025 22:47:10 +0200
Subject: [PATCH] Use system dependencies
---
.gitmodules | 34 -----------------------
src/xenia/emulator.cc | 2 +-
third_party/SDL2 | 1 -
third_party/SDL2/include | 1 +
third_party/SPIRV-Tools | 1 -
third_party/SPIRV-Tools/include | 1 +
third_party/Vulkan-Headers | 1 -
third_party/Vulkan-Headers/include/vulkan | 1 +
third_party/cxxopts | 1 -
third_party/cxxopts/include/cxxopts.hpp | 1 +
third_party/date | 2 +-
third_party/imgui | 2 +-
third_party/libusb | 2 +-
third_party/rapidcsv | 2 +-
third_party/tabulate | 2 +-
third_party/tomlplusplus | 1 -
third_party/tomlplusplus/impl | 1 +
third_party/tomlplusplus/include | 1 +
third_party/tomlplusplus/toml.hpp | 1 +
third_party/utfcpp | 2 +-
third_party/xbyak | 2 +-
21 files changed, 15 insertions(+), 47 deletions(-)
delete mode 160000 third_party/SDL2
create mode 120000 third_party/SDL2/include
delete mode 160000 third_party/SPIRV-Tools
create mode 120000 third_party/SPIRV-Tools/include
delete mode 160000 third_party/Vulkan-Headers
create mode 120000 third_party/Vulkan-Headers/include/vulkan
delete mode 160000 third_party/cxxopts
create mode 120000 third_party/cxxopts/include/cxxopts.hpp
delete mode 160000 third_party/tomlplusplus
create mode 120000 third_party/tomlplusplus/impl
create mode 120000 third_party/tomlplusplus/include
create mode 120000 third_party/tomlplusplus/toml.hpp
diff --git a/.gitmodules b/.gitmodules
index 0ee64ac52..b2b50a188 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -20,24 +20,9 @@
[submodule "third_party/aes_128"]
path = third_party/aes_128
url = https://github.com/openluopworld/aes_128.git
-[submodule "third_party/capstone"]
- path = third_party/capstone
- url = https://github.com/capstone-engine/capstone.git
-[submodule "third_party/tomlplusplus"]
- path = third_party/tomlplusplus
- url = https://github.com/marzer/tomlplusplus.git
-[submodule "third_party/cxxopts"]
- path = third_party/cxxopts
- url = https://github.com/jarro2783/cxxopts.git
-[submodule "third_party/SDL2"]
- path = third_party/SDL2
- url = https://github.com/libsdl-org/SDL.git
[submodule "third_party/utfcpp"]
path = third_party/utfcpp
url = https://github.com/nemtrif/utfcpp.git
-[submodule "third_party/fmt"]
- path = third_party/fmt
- url = https://github.com/fmtlib/fmt.git
[submodule "third_party/disruptorplus"]
path = third_party/disruptorplus
url = https://github.com/xenia-canary/disruptorplus.git
@@ -47,9 +32,6 @@
[submodule "third_party/date"]
path = third_party/date
url = https://github.com/HowardHinnant/date.git
-[submodule "third_party/xxhash"]
- path = third_party/xxhash
- url = https://github.com/Cyan4973/xxHash.git
[submodule "third_party/FFmpeg"]
path = third_party/FFmpeg
url = https://github.com/has207/FFmpeg.git
@@ -60,37 +42,21 @@
[submodule "third_party/FidelityFX-FSR"]
path = third_party/FidelityFX-FSR
url = https://github.com/GPUOpen-Effects/FidelityFX-FSR.git
-[submodule "third_party/Vulkan-Headers"]
- path = third_party/Vulkan-Headers
- url = https://github.com/KhronosGroup/Vulkan-Headers.git
[submodule "third_party/glslang"]
path = third_party/glslang
url = https://github.com/KhronosGroup/glslang.git
-[submodule "third_party/SPIRV-Tools"]
- path = third_party/SPIRV-Tools
- url = https://github.com/KhronosGroup/SPIRV-Tools.git
[submodule "third_party/VulkanMemoryAllocator"]
path = third_party/VulkanMemoryAllocator
url = https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git
[submodule "third_party/zstd"]
path = third_party/zstd
url = https://github.com/facebook/zstd.git
-[submodule "third_party/zarchive"]
- path = third_party/zarchive
- url = https://github.com/exzap/ZArchive.git
[submodule "third_party/tabulate"]
path = third_party/tabulate
url = https://github.com/p-ranav/tabulate.git
[submodule "third_party/rapidcsv"]
path = third_party/rapidcsv
url = https://github.com/d99kris/rapidcsv.git
-[submodule "third_party/zlib-ng"]
- path = third_party/zlib-ng
- url = https://github.com/zlib-ng/zlib-ng.git
- ignore = dirty
-[submodule "third_party/pugixml"]
- path = third_party/pugixml
- url = https://github.com/zeux/pugixml.git
[submodule "third_party/libusb"]
path = third_party/libusb
url = https://github.com/libusb/libusb.git
diff --git a/src/xenia/emulator.cc b/src/xenia/emulator.cc
index b0acd0feb..75e8455a0 100644
--- a/src/xenia/emulator.cc
+++ b/src/xenia/emulator.cc
@@ -16,7 +16,7 @@
#include "third_party/tabulate/single_include/tabulate/tabulate.hpp"
#include "third_party/zarchive/include/zarchive/zarchivecommon.h"
#include "third_party/zarchive/include/zarchive/zarchivewriter.h"
-#include "third_party/zarchive/src/sha_256.h"
+// #include "third_party/zarchive/src/sha_256.h"
#include "xenia/apu/audio_system.h"
#include "xenia/base/assert.h"
#include "xenia/base/byte_stream.h"
diff --git a/third_party/SDL2 b/third_party/SDL2
deleted file mode 160000
index e11183ea6..000000000
--- a/third_party/SDL2
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e11183ea6caa3ae4895f4bc54cad2bbb0e365417
diff --git a/third_party/SDL2/include b/third_party/SDL2/include
new file mode 120000
index 000000000..38776340f
--- /dev/null
+++ b/third_party/SDL2/include
@@ -0,0 +1 @@
+/usr/include/SDL2
\ No newline at end of file
diff --git a/third_party/SPIRV-Tools b/third_party/SPIRV-Tools
deleted file mode 160000
index 33e025681..000000000
--- a/third_party/SPIRV-Tools
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 33e02568181e3312f49a3cf33df470bf96ef293a
diff --git a/third_party/SPIRV-Tools/include b/third_party/SPIRV-Tools/include
new file mode 120000
index 000000000..408ea0f82
--- /dev/null
+++ b/third_party/SPIRV-Tools/include
@@ -0,0 +1 @@
+/usr/include
\ No newline at end of file
diff --git a/third_party/Vulkan-Headers b/third_party/Vulkan-Headers
deleted file mode 160000
index 2cd90f9d2..000000000
--- a/third_party/Vulkan-Headers
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2cd90f9d20df57eac214c148f3aed885372ddcfe
diff --git a/third_party/Vulkan-Headers/include/vulkan b/third_party/Vulkan-Headers/include/vulkan
new file mode 120000
index 000000000..b1548a777
--- /dev/null
+++ b/third_party/Vulkan-Headers/include/vulkan
@@ -0,0 +1 @@
+/usr/include/vulkan
\ No newline at end of file
diff --git a/third_party/cxxopts b/third_party/cxxopts
deleted file mode 160000
index f029892da..000000000
--- a/third_party/cxxopts
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f029892dab60526184ee42ae63a7f6d19a6b0e49
diff --git a/third_party/cxxopts/include/cxxopts.hpp b/third_party/cxxopts/include/cxxopts.hpp
new file mode 120000
index 000000000..9b8b3dc8a
--- /dev/null
+++ b/third_party/cxxopts/include/cxxopts.hpp
@@ -0,0 +1 @@
+/usr/include/cxxopts.hpp
\ No newline at end of file
diff --git a/third_party/date b/third_party/date
index f94b8f36c..e32a0d809 160000
--- a/third_party/date
+++ b/third_party/date
@@ -1 +1 @@
-Subproject commit f94b8f36c6180be0021876c4a397a054fe50c6f2
+Subproject commit e32a0d809c3d3c4797826825dc2d0b287281e3b2
diff --git a/third_party/imgui b/third_party/imgui
index 4806a1924..c0d02e5ae 160000
--- a/third_party/imgui
+++ b/third_party/imgui
@@ -1 +1 @@
-Subproject commit 4806a1924ff6181180bf5e4b8b79ab4394118875
+Subproject commit c0d02e5ae42d26dbe9b31f76233f1c96c3407162
diff --git a/third_party/libusb b/third_party/libusb
index a61afe5f7..3dbfa16f0 160000
--- a/third_party/libusb
+++ b/third_party/libusb
@@ -1 +1 @@
-Subproject commit a61afe5f75d969c4561a1d0ad753aa23cee6329a
+Subproject commit 3dbfa16f0cd9e8ed4fec916c6c00f41c738cb8f4
diff --git a/third_party/rapidcsv b/third_party/rapidcsv
index a98b85e66..d76cf1c08 160000
--- a/third_party/rapidcsv
+++ b/third_party/rapidcsv
@@ -1 +1 @@
-Subproject commit a98b85e663114b8fdc9c0dc03abf22c296f38241
+Subproject commit d76cf1c08e79be1eb04c9d4d8eb7893221127991
diff --git a/third_party/tabulate b/third_party/tabulate
index 3a5830106..b9026bf1e 160000
--- a/third_party/tabulate
+++ b/third_party/tabulate
@@ -1 +1 @@
-Subproject commit 3a58301067bbc03da89ae5a51b3e05b7da719d38
+Subproject commit b9026bf1e31dd561680e20cfda2a37716161aac1
diff --git a/third_party/tomlplusplus b/third_party/tomlplusplus
deleted file mode 160000
index 708fff700..000000000
--- a/third_party/tomlplusplus
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 708fff700f36ab3c2ab107b984ec9f3b8be5f055
diff --git a/third_party/tomlplusplus/impl b/third_party/tomlplusplus/impl
new file mode 120000
index 000000000..77969bc9d
--- /dev/null
+++ b/third_party/tomlplusplus/impl
@@ -0,0 +1 @@
+/usr/include/toml++/impl
\ No newline at end of file
diff --git a/third_party/tomlplusplus/include b/third_party/tomlplusplus/include
new file mode 120000
index 000000000..408ea0f82
--- /dev/null
+++ b/third_party/tomlplusplus/include
@@ -0,0 +1 @@
+/usr/include
\ No newline at end of file
diff --git a/third_party/tomlplusplus/toml.hpp b/third_party/tomlplusplus/toml.hpp
new file mode 120000
index 000000000..a07398185
--- /dev/null
+++ b/third_party/tomlplusplus/toml.hpp
@@ -0,0 +1 @@
+/usr/include/toml++/toml.hpp
\ No newline at end of file
diff --git a/third_party/utfcpp b/third_party/utfcpp
index 65701fe00..da71cf910 160000
--- a/third_party/utfcpp
+++ b/third_party/utfcpp
@@ -1 +1 @@
-Subproject commit 65701fe00700577f9f4e9b96d682bd7cfcc0b76e
+Subproject commit da71cf91038973df102d19510d0be3cc9f730eeb
diff --git a/third_party/xbyak b/third_party/xbyak
index 4e44f4614..e09816e75 160000
--- a/third_party/xbyak
+++ b/third_party/xbyak
@@ -1 +1 @@
-Subproject commit 4e44f4614ddbf038f2a6296f5b906d5c72691e0f
+Subproject commit e09816e752b0c9d93a4abc4fd045d89c8a3a825d
--
2.53.0
|