Skip to content

Commit 24f5a52

Browse files
committed
libromfs is now pulled dynamically.
1 parent 9766c0c commit 24f5a52

4 files changed

Lines changed: 17 additions & 16 deletions

File tree

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
[submodule "dep/imgui"]
22
path = dep/imgui
33
url = https://github.com/ocornut/imgui.git
4-
[submodule "dep/libromfs"]
5-
path = dep/libromfs
6-
url = https://github.com/WerWolv/libromfs.git

dep/build.py

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -903,20 +903,27 @@
903903
clibrary(
904904
name="microtar_lib",
905905
srcs=["dep/r/microtar/src/microtar.c"],
906-
hdrs={"microtar.h":"dep/r/microtar/src/microtar.h"},
906+
hdrs={"microtar.h": "dep/r/microtar/src/microtar.h"},
907907
deps=[
908908
git_repository(
909909
name="microtar_repo",
910910
url="https://github.com/rxi/microtar",
911911
branch="v0.1.0",
912912
path="dep/r/microtar",
913913
),
914-
]
914+
],
915915
)
916916

917917
git_repository(
918-
name="imhex_repo",
919-
url="https://github.com/davidgiven/ImHex",
920-
branch="master",
921-
path="dep/r/imhex",
922-
),
918+
name="imhex_repo",
919+
url="https://github.com/davidgiven/ImHex",
920+
branch="master",
921+
path="dep/r/imhex",
922+
),
923+
924+
git_repository(
925+
name="libromfs_repo",
926+
url="https://github.com/WerWolv/libromfs",
927+
branch="master",
928+
path="dep/r/libromfs",
929+
),

dep/libromfs

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/gui2/build.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
from build.ab import simplerule
33
from build.pkg import package
44
from build.utils import glob
5-
from functools import reduce
6-
import operator
75
from os.path import *
86
import config
97

@@ -384,17 +382,17 @@ def plugin(name, id, srcs, hdrs, romfsdir, deps):
384382

385383
cxxlibrary(
386384
name=name,
387-
srcs=srcs + [f".+{id}_romfs", "dep/libromfs/lib/source/romfs.cpp"],
385+
srcs=srcs + [f".+{id}_romfs", "dep/r/libromfs/lib/source/romfs.cpp"],
388386
hdrs=hdrs
389-
| {"romfs/romfs.hpp": "dep/libromfs/lib/include/romfs/romfs.hpp"},
387+
| {"romfs/romfs.hpp": "dep/r/libromfs/lib/include/romfs/romfs.hpp"},
390388
cflags=cflags
391389
+ [
392390
f"-DIMHEX_PLUGIN_NAME={id}",
393391
f"-DLIBROMFS_PROJECT_NAME={id}",
394392
f"-DIMHEX_PLUGIN_FEATURES_CONTENT=",
395393
f"-Dromfs=romfs_{id}",
396394
],
397-
deps=deps,
395+
deps=deps + ["dep+libromfs_repo"],
398396
)
399397

400398

0 commit comments

Comments
 (0)