lunasvg is now dynamically pulled.

Author: davidgiven

.gitmodules

@@ -16,6 +16,3 @@
 [submodule "dep/libromfs"]
 	path = dep/libromfs
 	url = https://github.com/WerWolv/libromfs.git
-[submodule "dep/lunasvg"]
-	path = dep/lunasvg
-	url = https://github.com/sammycage/lunasvg.git

dep/build.py

@@ -408,3 +408,51 @@
         ],
     ),
 )
+
+package(
+    name="lunasvg",
+    package="lunasvg",
+    fallback=cxxlibrary(
+        name="lunasvg_fallback_lib",
+        srcs=[
+            "dep/lunasvg/source/svgtextelement.cpp",
+            "dep/lunasvg/source/lunasvg.cpp",
+            "dep/lunasvg/source/graphics.h",
+            "dep/lunasvg/source/svggeometryelement.cpp",
+            "dep/lunasvg/source/svgproperty.cpp",
+            "dep/lunasvg/source/graphics.cpp",
+            "dep/lunasvg/source/svgpaintelement.cpp",
+            "dep/lunasvg/source/svgparser.cpp",
+            "dep/lunasvg/source/svgelement.cpp",
+            "dep/lunasvg/source/svgrenderstate.h",
+            "dep/lunasvg/source/svgproperty.h",
+            "dep/lunasvg/source/svgpaintelement.h",
+            "dep/lunasvg/source/svgelement.h",
+            "dep/lunasvg/source/svgtextelement.h",
+            "dep/lunasvg/source/svggeometryelement.h",
+            "dep/lunasvg/source/svgparserutils.h",
+            "dep/lunasvg/source/svglayoutstate.cpp",
+            "dep/lunasvg/source/svglayoutstate.h",
+            "dep/lunasvg/source/svgrenderstate.cpp",
+        ],
+        hdrs={"lunasvg.h": "dep/lunasvg/include/lunasvg.h"},
+        deps=[
+            "dep+plutovg_lib",
+            "dep+fmt_lib",
+            git_repository(
+                name="lunasvg_repo",
+                url="https://github.com/sammycage/lunasvg",
+                branch="v3.5.0",
+                path="dep/lunasvg",
+            ),
+        ],
+        cflags=[
+            "-DLUNASVG_BUILD_STATIC",
+            "-DPLUTOVG_BUILD_STATIC",
+        ],
+        caller_cflags=[
+            "-DLUNASVG_BUILD_STATIC",
+            "-DPLUTOVG_BUILD_STATIC",
+        ],
+    ),
+)

dep/lunasvg

@@ -11,8 +11,6 @@
     '-DIMHEX_PROJECT_NAME=\\"fluxengine\\"',
     "-DIMHEX_STATIC_LINK_PLUGINS",
     '-DIMHEX_VERSION=\\"0.0.0\\"',
-    "-DLUNASVG_BUILD_STATIC",
-    "-DPLUTOVG_BUILD_STATIC",
     "-DUNICODE",
     # "-DDEBUG",
 ]
@@ -74,17 +72,6 @@ def sources_from(path, except_for=[]):
         deps=[".+dbus_lib"],
     )
 
-package(
-    name="lunasvg",
-    package="lunasvg",
-    fallback=cxxlibrary(
-        name="lunasvg_fallback_lib",
-        srcs=sources_from("dep/lunasvg/source"),
-        hdrs=headers_from("dep/lunasvg/include"),
-        deps=["dep+plutovg_lib", "dep+fmt_lib"],
-        cflags=cflags,
-    ),
-)
 cxxlibrary(
     name="imgui",
     srcs=sources_from("dep/imhex/lib/third_party/imgui/backend/source")
@@ -110,7 +97,7 @@ def sources_from(path, except_for=[]):
         "imgui_freetype.h": "dep/imhex/lib/third_party/imgui/imgui/include/misc/freetype/imgui_freetype.h",
         "imconfig.h": "./imhex_overrides/imconfig.h",
     },
-    deps=[".+freetype2_lib", ".+lunasvg", ".+glfw3_lib"],
+    deps=[".+freetype2_lib", "dep+lunasvg", ".+glfw3_lib"],
 )
 
 cxxprogram(