Skip to content

Commit 41ac20d

Browse files
committed
throwing_ptr is now fetched dynamically.
1 parent d97e5b2 commit 41ac20d

4 files changed

Lines changed: 24 additions & 11 deletions

File tree

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
[submodule "dep/libromfs"]
2020
path = dep/libromfs
2121
url = https://github.com/WerWolv/libromfs.git
22-
[submodule "dep/throwing_ptr"]
23-
path = dep/throwing_ptr
24-
url = https://github.com/rockdreamer/throwing_ptr.git
2522
[submodule "dep/lunasvg"]
2623
path = dep/lunasvg
2724
url = https://github.com/sammycage/lunasvg.git

dep/build.py

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,3 +294,26 @@
294294
],
295295
),
296296
)
297+
298+
cxxlibrary(
299+
name="libthrowingptr",
300+
srcs=[],
301+
hdrs={
302+
h: f"dep/throwing_ptr/include/{h}"
303+
for h in [
304+
"throwing/unique_ptr.hpp",
305+
"throwing/private/clear_compiler_checks.hpp",
306+
"throwing/private/compiler_checks.hpp",
307+
"throwing/shared_ptr.hpp",
308+
"throwing/null_ptr_exception.hpp",
309+
]
310+
},
311+
deps=[
312+
git_repository(
313+
name="libthrowingptr_repo",
314+
url="https://github.com/rockdreamer/throwing_ptr",
315+
branch="master",
316+
path="dep/throwing_ptr",
317+
)
318+
],
319+
)

dep/throwing_ptr

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

src/gui2/build.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -196,12 +196,6 @@ def sources_from(path, except_for=[]):
196196
cflags=cflags,
197197
)
198198

199-
cxxlibrary(
200-
name="libthrowingptr",
201-
srcs=[],
202-
hdrs=headers_from("dep/throwing_ptr/include"),
203-
)
204-
205199
cxxlibrary(
206200
name="libpl",
207201
srcs=sources_from("dep/pattern-language/lib/source")
@@ -212,7 +206,7 @@ def sources_from(path, except_for=[]):
212206
| headers_from("dep/pattern-language/cli/include")
213207
),
214208
deps=[
215-
".+libthrowingptr",
209+
"dep+libthrowingptr",
216210
".+libwolv",
217211
"+fmt_lib",
218212
"dep+cli11_lib",

0 commit comments

Comments
 (0)