Beef up testing in tools/* - Build and run all tools, including glfw, on Mac and Windows as well. - Consolidate tests that don't need to be in a downstream repo into the tools/test directory. - Change the build output directory to "out/debug/<executable>" to avoid tab completion to "builtin" when trying to access the "build" directory. - Update the Mac Skia built to support GLES so we can run ANGLE. Diffs= 75a6b74b8 Beef up testing in tools/*
diff --git a/.rive_head b/.rive_head index 72a2472..ca68571 100644 --- a/.rive_head +++ b/.rive_head
@@ -1 +1 @@ -79f98695a664d4630b757572a4aa260e3ba8d5cf +75a6b74b86fff27165430a4bce8ec3ca09a1c69b
diff --git a/skia/dependencies/make_skia.sh b/skia/dependencies/make_skia.sh index ea2109f..05891ee 100755 --- a/skia/dependencies/make_skia.sh +++ b/skia/dependencies/make_skia.sh
@@ -2,6 +2,7 @@ set -e +export MAKE_SKIA_FILE=make_skia.sh ./get_skia.sh # use Rive optimized/stripped Skia for iOS static libs. @@ -256,6 +257,7 @@ skia_enable_skottie=false \ skia_enable_tools=false \ skia_enable_skgpu_v2=false \ + skia_gl_standard = \"\" \ " ninja -C out/static du -hs out/static/libskia.a
diff --git a/skia/dependencies/make_skia_recorder.sh b/skia/dependencies/make_skia_recorder.sh index 0cd348b..22c036e 100755 --- a/skia/dependencies/make_skia_recorder.sh +++ b/skia/dependencies/make_skia_recorder.sh
@@ -1,6 +1,7 @@ #!/bin/bash set -ex +export MAKE_SKIA_FILE=make_skia_recorder.sh source ./get_skia2.sh source ./cache_helper.sh @@ -52,6 +53,7 @@ skia_enable_tools = false \ skia_enable_skgpu_v1 = true \ skia_enable_skgpu_v2 = false \ + skia_gl_standard = \"\" \ " ninja -C out/static @@ -68,4 +70,4 @@ build_skia_recorder OUTPUT_CACHE=out upload_cache fi -fi \ No newline at end of file +fi