commit 6b6f1db867264fe064fbd6352bc567317c5d9acc
author Luigi Rosso <luigi.rosso@gmail.com> Fri Jan 28 09:18:35 2022 -0800
committer Luigi Rosso <luigi-rosso@users.noreply.github.com> Fri Jan 28 10:22:35 2022 -0800
tree 22b24146d63130e0429e7f5f5b4ecfc85b1eb8e7
parent 1d890ee69a23649b742ade28011b04696fc89e4f

Fix renderer to use skia_rive_optimized for iOS and android.

skia/renderer/build/premake5.lua

diff --git a/skia/renderer/build/premake5.lua b/skia/renderer/build/premake5.lua
index 4303423..5f5a254 100644
--- a/skia/renderer/build/premake5.lua
+++ b/skia/renderer/build/premake5.lua
@@ -8,9 +8,7 @@
     toolset "clang"
     targetdir "%{cfg.system}/bin/%{cfg.buildcfg}"
     objdir "%{cfg.system}/obj/%{cfg.buildcfg}"
-    includedirs {"../include", "../../../include", "../../dependencies/skia", "../../dependencies/skia/include/core",
-             "../../dependencies/skia/include/effects", "../../dependencies/skia/include/gpu",
-             "../../dependencies/skia/include/config"}
+    includedirs {"../include", "../../../include"}
 
     if os.host() == "macosx" then
         links {"Cocoa.framework", "rive", "skia"}
@@ -18,7 +16,7 @@
         links {"rive", "skia"}
     end
 
-    libdirs {"../../../build/%{cfg.system}/bin/%{cfg.buildcfg}", "../../dependencies/skia/out/static"}
+    libdirs {"../../../build/%{cfg.system}/bin/%{cfg.buildcfg}"}
 
     files {"../src/**.cpp"}
 
@@ -26,9 +24,23 @@
 
     filter {"system:macosx" }
         buildoptions {"-flto=full"}
+        includedirs {"../../dependencies/skia", "../../dependencies/skia/include/core",
+             "../../dependencies/skia/include/effects", "../../dependencies/skia/include/gpu",
+             "../../dependencies/skia/include/config"}
+        libdirs {"../../dependencies/skia/out/static"}
+
+    filter {"system:linux" }
+        includedirs {"../../dependencies/skia", "../../dependencies/skia/include/core",
+             "../../dependencies/skia/include/effects", "../../dependencies/skia/include/gpu",
+             "../../dependencies/skia/include/config"}
+        libdirs {"../../dependencies/skia/out/static"}
 
     filter {"system:ios" }
         buildoptions {"-flto=full"}
+        includedirs {"../../dependencies/skia_rive_optimized", "../../dependencies/skia_rive_optimized/include/core",
+             "../../dependencies/skia_rive_optimized/include/effects", "../../dependencies/skia_rive_optimized/include/gpu",
+             "../../dependencies/skia_rive_optimized/include/config"}
+        libdirs {"../../dependencies/skia_rive_optimized/out/static"}
 
     filter {"system:ios", "options:variant=system" }
         buildoptions {"-mios-version-min=10.0 -fembed-bitcode -arch armv7 -arch arm64 -arch arm64e -isysroot " .. (os.getenv("IOS_SYSROOT") or "")}
@@ -37,8 +49,14 @@
         buildoptions {"-mios-version-min=10.0 -arch x86_64 -arch arm64 -arch i386 -isysroot " .. (os.getenv("IOS_SYSROOT") or "")}
         targetdir "%{cfg.system}_sim/bin/%{cfg.buildcfg}"
         objdir "%{cfg.system}_sim/obj/%{cfg.buildcfg}"
-    
+
     -- Is there a way to pass 'arch' as a variable here?
+    filter { "system:android" }
+        includedirs {"../../dependencies/skia_rive_optimized", "../../dependencies/skia_rive_optimized/include/core",
+             "../../dependencies/skia_rive_optimized/include/effects", "../../dependencies/skia_rive_optimized/include/gpu",
+             "../../dependencies/skia_rive_optimized/include/config"}
+        libdirs {"../../dependencies/skia_rive_optimized/out/static"}
+
     filter { "system:android", "options:arch=x86" }
         targetdir "%{cfg.system}/x86/bin/%{cfg.buildcfg}"
         objdir "%{cfg.system}/x86/obj/%{cfg.buildcfg}"