1 files changed, 37 insertions, 34 deletions
diff --git a/modules/svg/SCsub b/modules/svg/SCsub
index 55b8c4f4a0..a99bc8df60 100644
--- a/modules/svg/SCsub
+++ b/modules/svg/SCsub
@@ -11,39 +11,45 @@ thirdparty_obj = []
 
 thirdparty_dir = "#thirdparty/thorvg/"
 thirdparty_sources = [
-    "src/lib/sw_engine/tvgSwFill.cpp",
-    "src/lib/sw_engine/tvgSwImage.cpp",
-    "src/lib/sw_engine/tvgSwMath.cpp",
-    "src/lib/sw_engine/tvgSwMemPool.cpp",
-    "src/lib/sw_engine/tvgSwRaster.cpp",
-    "src/lib/sw_engine/tvgSwRenderer.cpp",
-    "src/lib/sw_engine/tvgSwRle.cpp",
-    "src/lib/sw_engine/tvgSwShape.cpp",
-    "src/lib/sw_engine/tvgSwStroke.cpp",
-    "src/lib/tvgAccessor.cpp",
-    "src/lib/tvgCanvas.cpp",
-    "src/lib/tvgFill.cpp",
-    "src/lib/tvgGlCanvas.cpp",
-    "src/lib/tvgInitializer.cpp",
-    "src/lib/tvgLoader.cpp",
-    "src/lib/tvgPaint.cpp",
-    "src/lib/tvgPicture.cpp",
-    "src/lib/tvgRender.cpp",
-    "src/lib/tvgSaver.cpp",
-    "src/lib/tvgScene.cpp",
-    "src/lib/tvgShape.cpp",
-    "src/lib/tvgSwCanvas.cpp",
-    "src/lib/tvgTaskScheduler.cpp",
-    "src/utils/tvgBezier.cpp",
-    "src/utils/tvgCompressor.cpp",
-    "src/utils/tvgStr.cpp",
-    "src/loaders/raw/tvgRawLoader.cpp",
+    # common
+    "src/common/tvgBezier.cpp",
+    "src/common/tvgCompressor.cpp",
+    "src/common/tvgMath.cpp",
+    "src/common/tvgStr.cpp",
+    # SVG parser
     "src/loaders/svg/tvgSvgCssStyle.cpp",
     "src/loaders/svg/tvgSvgLoader.cpp",
     "src/loaders/svg/tvgSvgPath.cpp",
     "src/loaders/svg/tvgSvgSceneBuilder.cpp",
     "src/loaders/svg/tvgSvgUtil.cpp",
     "src/loaders/svg/tvgXmlParser.cpp",
+    "src/loaders/raw/tvgRawLoader.cpp",
+    # renderer common
+    "src/renderer/tvgAccessor.cpp",
+    # "src/renderer/tvgAnimation.cpp",
+    "src/renderer/tvgCanvas.cpp",
+    "src/renderer/tvgFill.cpp",
+    # "src/renderer/tvgGlCanvas.cpp",
+    "src/renderer/tvgInitializer.cpp",
+    "src/renderer/tvgLoader.cpp",
+    "src/renderer/tvgPaint.cpp",
+    "src/renderer/tvgPicture.cpp",
+    "src/renderer/tvgRender.cpp",
+    # "src/renderer/tvgSaver.cpp",
+    "src/renderer/tvgScene.cpp",
+    "src/renderer/tvgShape.cpp",
+    "src/renderer/tvgSwCanvas.cpp",
+    "src/renderer/tvgTaskScheduler.cpp",
+    # renderer sw_engine
+    "src/renderer/sw_engine/tvgSwFill.cpp",
+    "src/renderer/sw_engine/tvgSwImage.cpp",
+    "src/renderer/sw_engine/tvgSwMath.cpp",
+    "src/renderer/sw_engine/tvgSwMemPool.cpp",
+    "src/renderer/sw_engine/tvgSwRaster.cpp",
+    "src/renderer/sw_engine/tvgSwRenderer.cpp",
+    "src/renderer/sw_engine/tvgSwRle.cpp",
+    "src/renderer/sw_engine/tvgSwShape.cpp",
+    "src/renderer/sw_engine/tvgSwStroke.cpp",
 ]
 
 thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
@@ -57,16 +63,13 @@ env_thirdparty = env_svg.Clone()
 env_thirdparty.disable_warnings()
 env_thirdparty.Prepend(
     CPPPATH=[
-        thirdparty_dir + "src/lib",
-        thirdparty_dir + "src/lib/sw_engine",
-        thirdparty_dir + "src/loaders/raw",
+        thirdparty_dir + "src/common",
         thirdparty_dir + "src/loaders/svg",
-        thirdparty_dir + "src/utils",
+        thirdparty_dir + "src/renderer",
+        thirdparty_dir + "src/renderer/sw_engine",
+        thirdparty_dir + "src/loaders/raw",
     ]
 )
-# Also requires libpng headers
-if env["builtin_libpng"]:
-    env_thirdparty.Prepend(CPPPATH=["#thirdparty/libpng"])
 
 env_thirdparty.add_source_files(thirdparty_obj, thirdparty_sources)
 env.modules_sources += thirdparty_obj