Skip to content

Commit 33c2b00

Browse files
twostarstwostars
authored
Remove llfio (#794)
While very performant and low-level, the complexity from this dependency causes some pain. It introduces convoluted build paths which easily exceed Windows' max path lengths, and it doesn't seem to play terribly nicely with CMake; it refuses to let me override anything I want to override, which I only wanted to do to bypass it loading headers for testing... due to Windows headers that mingw doesn't like (they should be lowercase). In short, it's a hassle. FileReader continues to be memory-mapped via boost::interprocess::file_mapping (though this may be overkill and worth swapping to fread() etc directly, with memory mapped files handled separately). FileWriter uses fwrite() etc instead.
1 parent 4dba4ff commit 33c2b00

30 files changed

+138
-1492
lines changed

‎.gitmodules‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,6 @@
5757
path = deps/googletest
5858
url = https://github.com/google/googletest
5959
shallow = true
60-
[submodule "deps/llfio"]
61-
path = deps/llfio
62-
url = https://github.com/Open-KO/llfio
63-
shallow = true
64-
[submodule "deps/llfio-msvc-dep-headers"]
65-
path = deps/llfio-msvc-dep-headers
66-
url = https://github.com/Open-KO/llfio-msvc-dep-headers
67-
shallow = true
6860
[submodule "deps/openal-soft"]
6961
path = deps/openal-soft
7062
url = https://github.com/Open-KO/openal-soft

‎All.slnx‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158
<BuildDependency Project="deps/fetch-and-build-wrappers/fetch-zlib.vcxproj" />
159159
</Project>
160160
<Project Path="src/FileIO/FileIO.vcxproj" Id="10195386-62c0-4bda-a8e3-b88f1c9f81af">
161-
<BuildDependency Project="deps/fetch-and-build-wrappers/fetch-llfio.vcxproj" />
161+
<BuildDependency Project="deps/fetch-and-build-wrappers/fetch-boost.vcxproj" />
162162
</Project>
163163
<Project Path="src/MathUtils/MathUtils.vcxproj" Id="07cd39fe-8cb1-46a2-81ab-485f2cae215f" />
164164
<Project Path="src/shared/shared.vcxproj" Id="c2feb024-8e46-4533-918b-7196caaa4e7d">
@@ -194,12 +194,6 @@
194194
<Project Path="deps/fetch-and-build-wrappers/fetch-libjpeg-turbo.vcxproj" Id="56988836-40f9-f81d-c8b4-4dc1ce5901e2">
195195
<BuildDependency Project="deps/fetch-and-build-wrappers/sync-submodules.vcxproj" />
196196
</Project>
197-
<Project Path="deps/fetch-and-build-wrappers/fetch-llfio-msvc-dep-headers.vcxproj" Id="673f0d3f-f447-43fd-856e-fab4e776debc">
198-
<BuildDependency Project="deps/fetch-and-build-wrappers/sync-submodules.vcxproj" />
199-
</Project>
200-
<Project Path="deps/fetch-and-build-wrappers/fetch-llfio.vcxproj" Id="47beb39c-b62a-4e48-8a9f-0ded4450cf9e">
201-
<BuildDependency Project="deps/fetch-and-build-wrappers/fetch-llfio-msvc-dep-headers.vcxproj" />
202-
</Project>
203197
<Project Path="deps/fetch-and-build-wrappers/fetch-mpg123.vcxproj" Id="b24123a5-2fe3-4ad6-9b8d-c3090e87408d">
204198
<BuildDependency Project="deps/fetch-and-build-wrappers/sync-submodules.vcxproj" />
205199
</Project>

‎CMakeLists.txt‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ endif()
102102
# Add dependencies
103103
set(CMAKE_FOLDER "_deps")
104104
require_package(Asio)
105-
require_package(LLFIO)
105+
require_package(BoostSubset)
106106
require_package(Spdlog)
107107

108108
include_directories(
@@ -183,9 +183,6 @@ if(OPENKO_BUILD_SERVERS)
183183
message(STATUS "OpenKO: Preparing to configure servers...")
184184

185185
# Dependencies
186-
set(CMAKE_FOLDER "Server/_deps/boost")
187-
require_package(BoostSubset)
188-
189186
set(CMAKE_FOLDER "Server/_deps/argparse")
190187
require_package(Argparse)
191188

‎Client.slnx‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,17 @@
1616
<BuildDependency Project="src/shared/shared.vcxproj" />
1717
</Project>
1818
<Project Path="src/FileIO/FileIO.vcxproj" Id="10195386-62c0-4bda-a8e3-b88f1c9f81af">
19-
<BuildDependency Project="deps/fetch-and-build-wrappers/fetch-llfio.vcxproj" />
19+
<BuildDependency Project="deps/fetch-and-build-wrappers/fetch-boost.vcxproj" />
2020
</Project>
2121
<Project Path="src/MathUtils/MathUtils.vcxproj" Id="07cd39fe-8cb1-46a2-81ab-485f2cae215f" />
2222
<Project Path="src/shared/shared.vcxproj" Id="c2feb024-8e46-4533-918b-7196caaa4e7d">
2323
<BuildDependency Project="deps/fetch-and-build-wrappers/fetch-spdlog.vcxproj" />
2424
</Project>
2525
</Folder>
2626
<Folder Name="/_deps/fetch wrappers/">
27+
<Project Path="deps/fetch-and-build-wrappers/fetch-boost.vcxproj" Id="1b69c1f8-b156-4bca-aad3-168fb37b08cf">
28+
<BuildDependency Project="deps/fetch-and-build-wrappers/sync-submodules.vcxproj" />
29+
</Project>
2730
<Project Path="deps/fetch-and-build-wrappers/fetch-dx9sdk.vcxproj" Id="50d2b40a-5ae4-f5fb-4d79-ac6cc3c75274">
2831
<BuildDependency Project="deps/fetch-and-build-wrappers/sync-submodules.vcxproj" />
2932
</Project>
@@ -33,12 +36,6 @@
3336
<Project Path="deps/fetch-and-build-wrappers/fetch-libjpeg-turbo.vcxproj" Id="56988836-40f9-f81d-c8b4-4dc1ce5901e2">
3437
<BuildDependency Project="deps/fetch-and-build-wrappers/sync-submodules.vcxproj" />
3538
</Project>
36-
<Project Path="deps/fetch-and-build-wrappers/fetch-llfio-msvc-dep-headers.vcxproj" Id="673f0d3f-f447-43fd-856e-fab4e776debc">
37-
<BuildDependency Project="deps/fetch-and-build-wrappers/sync-submodules.vcxproj" />
38-
</Project>
39-
<Project Path="deps/fetch-and-build-wrappers/fetch-llfio.vcxproj" Id="47beb39c-b62a-4e48-8a9f-0ded4450cf9e">
40-
<BuildDependency Project="deps/fetch-and-build-wrappers/fetch-llfio-msvc-dep-headers.vcxproj" />
41-
</Project>
4239
<Project Path="deps/fetch-and-build-wrappers/fetch-mpg123.vcxproj" Id="b24123a5-2fe3-4ad6-9b8d-c3090e87408d">
4340
<BuildDependency Project="deps/fetch-and-build-wrappers/sync-submodules.vcxproj" />
4441
</Project>

‎Server.slnx‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<Build Project="false" />
1515
</Project>
1616
<Project Path="src/FileIO/FileIO.vcxproj" Id="10195386-62c0-4bda-a8e3-b88f1c9f81af">
17-
<BuildDependency Project="deps/fetch-and-build-wrappers/fetch-llfio.vcxproj" />
17+
<BuildDependency Project="deps/fetch-and-build-wrappers/fetch-boost.vcxproj" />
1818
</Project>
1919
<Project Path="src/MathUtils/MathUtils.vcxproj" Id="07cd39fe-8cb1-46a2-81ab-485f2cae215f" />
2020
<Project Path="src/Server/shared-server/shared-server.vcxproj" Id="c630cf44-84a8-4586-a710-c420bf54dc13">
@@ -51,12 +51,6 @@
5151
<Project Path="deps/fetch-and-build-wrappers/fetch-dx9sdk.vcxproj" Id="50d2b40a-5ae4-f5fb-4d79-ac6cc3c75274">
5252
<BuildDependency Project="deps/fetch-and-build-wrappers/sync-submodules.vcxproj" />
5353
</Project>
54-
<Project Path="deps/fetch-and-build-wrappers/fetch-llfio-msvc-dep-headers.vcxproj" Id="673f0d3f-f447-43fd-856e-fab4e776debc">
55-
<BuildDependency Project="deps/fetch-and-build-wrappers/sync-submodules.vcxproj" />
56-
</Project>
57-
<Project Path="deps/fetch-and-build-wrappers/fetch-llfio.vcxproj" Id="47beb39c-b62a-4e48-8a9f-0ded4450cf9e">
58-
<BuildDependency Project="deps/fetch-and-build-wrappers/fetch-llfio-msvc-dep-headers.vcxproj" />
59-
</Project>
6054
<Project Path="deps/fetch-and-build-wrappers/fetch-nanodbc.vcxproj" Id="3f38fd98-5c7e-97c7-70a9-fda7e34a0cfc">
6155
<BuildDependency Project="deps/fetch-and-build-wrappers/sync-submodules.vcxproj" />
6256
</Project>

‎Tests.slnx‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<BuildDependency Project="deps/fetch-and-build-wrappers/fetch-zlib.vcxproj" />
4343
</Project>
4444
<Project Path="src/FileIO/FileIO.vcxproj" Id="10195386-62c0-4bda-a8e3-b88f1c9f81af">
45-
<BuildDependency Project="deps/fetch-and-build-wrappers/fetch-llfio.vcxproj" />
45+
<BuildDependency Project="deps/fetch-and-build-wrappers/fetch-boost.vcxproj" />
4646
</Project>
4747
<Project DefaultStartup="true" Path="src/MathUtils/MathUtils.vcxproj" Id="07cd39fe-8cb1-46a2-81ab-485f2cae215f" />
4848
<Project Path="src/Server/shared-server/shared-server.vcxproj" Id="c630cf44-84a8-4586-a710-c420bf54dc13">
@@ -84,12 +84,6 @@
8484
<Project Path="deps/fetch-and-build-wrappers/fetch-libjpeg-turbo.vcxproj" Id="56988836-40f9-f81d-c8b4-4dc1ce5901e2">
8585
<BuildDependency Project="deps/fetch-and-build-wrappers/sync-submodules.vcxproj" />
8686
</Project>
87-
<Project Path="deps/fetch-and-build-wrappers/fetch-llfio-msvc-dep-headers.vcxproj" Id="673f0d3f-f447-43fd-856e-fab4e776debc">
88-
<BuildDependency Project="deps/fetch-and-build-wrappers/sync-submodules.vcxproj" />
89-
</Project>
90-
<Project Path="deps/fetch-and-build-wrappers/fetch-llfio.vcxproj" Id="47beb39c-b62a-4e48-8a9f-0ded4450cf9e">
91-
<BuildDependency Project="deps/fetch-and-build-wrappers/fetch-llfio-msvc-dep-headers.vcxproj" />
92-
</Project>
9387
<Project Path="deps/fetch-and-build-wrappers/fetch-mpg123.vcxproj" Id="b24123a5-2fe3-4ad6-9b8d-c3090e87408d">
9488
<BuildDependency Project="deps/fetch-and-build-wrappers/sync-submodules.vcxproj" />
9589
</Project>

‎ThirdParty.slnx‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,6 @@
2626
<Project Path="deps/fetch-and-build-wrappers/fetch-libjpeg-turbo.vcxproj" Id="56988836-40f9-f81d-c8b4-4dc1ce5901e2">
2727
<BuildDependency Project="deps/fetch-and-build-wrappers/sync-submodules.vcxproj" />
2828
</Project>
29-
<Project Path="deps/fetch-and-build-wrappers/fetch-llfio-msvc-dep-headers.vcxproj" Id="673f0d3f-f447-43fd-856e-fab4e776debc">
30-
<BuildDependency Project="deps/fetch-and-build-wrappers/sync-submodules.vcxproj" />
31-
</Project>
32-
<Project Path="deps/fetch-and-build-wrappers/fetch-llfio.vcxproj" Id="47beb39c-b62a-4e48-8a9f-0ded4450cf9e">
33-
<BuildDependency Project="deps/fetch-and-build-wrappers/fetch-llfio-msvc-dep-headers.vcxproj" />
34-
</Project>
3529
<Project Path="deps/fetch-and-build-wrappers/fetch-mpg123.vcxproj" Id="b24123a5-2fe3-4ad6-9b8d-c3090e87408d">
3630
<BuildDependency Project="deps/fetch-and-build-wrappers/sync-submodules.vcxproj" />
3731
</Project>

‎Tools.slnx‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<BuildDependency Project="src/shared/shared.vcxproj" />
1515
</Project>
1616
<Project Path="src/FileIO/FileIO.vcxproj" Id="10195386-62c0-4bda-a8e3-b88f1c9f81af">
17-
<BuildDependency Project="deps/fetch-and-build-wrappers/fetch-llfio.vcxproj" />
17+
<BuildDependency Project="deps/fetch-and-build-wrappers/fetch-boost.vcxproj" />
1818
</Project>
1919
<Project Path="src/MathUtils/MathUtils.vcxproj" Id="07cd39fe-8cb1-46a2-81ab-485f2cae215f" />
2020
<Project Path="src/shared/shared.vcxproj" Id="c2feb024-8e46-4533-918b-7196caaa4e7d">
@@ -29,12 +29,6 @@
2929
<Project Path="deps/fetch-and-build-wrappers/fetch-dx9sdk.vcxproj" Id="50d2b40a-5ae4-f5fb-4d79-ac6cc3c75274">
3030
<BuildDependency Project="deps/fetch-and-build-wrappers/sync-submodules.vcxproj" />
3131
</Project>
32-
<Project Path="deps/fetch-and-build-wrappers/fetch-llfio-msvc-dep-headers.vcxproj" Id="673f0d3f-f447-43fd-856e-fab4e776debc">
33-
<BuildDependency Project="deps/fetch-and-build-wrappers/sync-submodules.vcxproj" />
34-
</Project>
35-
<Project Path="deps/fetch-and-build-wrappers/fetch-llfio.vcxproj" Id="47beb39c-b62a-4e48-8a9f-0ded4450cf9e">
36-
<BuildDependency Project="deps/fetch-and-build-wrappers/fetch-llfio-msvc-dep-headers.vcxproj" />
37-
</Project>
3832
<Project Path="deps/fetch-and-build-wrappers/fetch-mpg123.vcxproj" Id="b24123a5-2fe3-4ad6-9b8d-c3090e87408d">
3933
<BuildDependency Project="deps/fetch-and-build-wrappers/sync-submodules.vcxproj" />
4034
</Project>

‎cmake/FindLLFIO.cmake‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎deps/fetch-and-build-wrappers/fetch-llfio-msvc-dep-headers.vcxproj‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)