Mirrors/rive-cpp
0
0
Fork 0
mirror of https://github.com/rive-app/rive-cpp.git synced 2026-01-18 13:11:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix premake tag

Browse Source 
fix builds for editor and tasks

Went with beta3 for anything that looks like apple silicone, seems to have been used in other cases (maybe we want to try beta4 though?)

also we use beta2 a "lot" elsewhere, so stuck to that on linux. but i think we should probably just bump everything to 4

Diffs=
b153a81b61 Fix premake tag (#8865)
8c9dc78dbd Android BrowserStack fixups (#8856)

Co-authored-by: Chris Dalton <99840794+csmartdalton@users.noreply.github.com>
Co-authored-by: Maxwell Talbot <talbot.maxwell@gmail.com>
This commit is contained in:
mjtalbot
2025-01-14 11:40:58 +00:00
parent 81f4e62739
commit 240e1dced2
6 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.rive_head
View File

@@ -1 +1 @@
eca00184b8fb096243a60594f94f91f39607a15e
b153a81b61b570f0d147916d96e28cbfcf0ad198

2
dependencies/gen_harfbuzz_renames/gen_renames.sh vendored
View File

@@ -8,7 +8,7 @@ if [[ ! -f "dependencies/bin/premake5" ]]; then
pushd dependencies
# v5.0.0-beta2 doesn't support apple silicon properly, update the branch
# once a stable one is avaialble that supports it
git clone --depth 1 --branch master https://github.com/premake/premake-core.git
git clone --depth 1 --branch v5.0.0-beta3 https://github.com/premake/premake-core.git
pushd premake-core
if [[ $LOCAL_ARCH == "arm64" ]]; then
PREMAKE_MAKE_ARCH=ARM

2
dependencies/gen_libjpeg_renames/gen_renames.sh vendored
View File

@@ -10,7 +10,7 @@ if [[ ! -f "dependencies/bin/premake5" ]]; then
pushd dependencies
# v5.0.0-beta2 doesn't support apple silicon properly, update the branch
# once a stable one is avaialble that supports it
git clone --depth 1 --branch master https://github.com/premake/premake-core.git
git clone --depth 1 --branch v5.0.0-beta3 https://github.com/premake/premake-core.git
pushd premake-core
if [[ $LOCAL_ARCH == "arm64" ]]; then
PREMAKE_MAKE_ARCH=ARM

2
dependencies/gen_yoga_renames/gen_renames.sh vendored
View File

@@ -8,7 +8,7 @@ if [[ ! -f "dependencies/bin/premake5" ]]; then
pushd dependencies
# v5.0.0-beta2 doesn't support apple silicon properly, update the branch
# once a stable one is avaialble that supports it
git clone --depth 1 --branch master https://github.com/premake/premake-core.git
git clone --depth 1 --branch v5.0.0-beta3 https://github.com/premake/premake-core.git
pushd premake-core
if [[ $LOCAL_ARCH == "arm64" ]]; then
PREMAKE_MAKE_ARCH=ARM

9
tests/diff.py
View File

@@ -131,9 +131,12 @@ class TestEntry(object):
# this is equivalent of implementing < operator. We use this for sorted and sort functions
def __lt__(self, other):
if (self.histogram is not None and
other.histogram is not None and
self.histogram != other.histogram):
# Always sort by avg first. Histogram is a good heuristic to divide into
# "pass/fail" buckets, but it's helpful to then see the fail bucked
# sorted by avg, which is more sensitive to differences.
if (self.avg == other.avg and
self.histogram is not None and
other.histogram is not None):
# LOWER histogram values mean worse matches. Sort the bad matches first.
return self.histogram > other.histogram
else:

2
tests/unit_tests/test.sh
View File

@@ -31,7 +31,7 @@ if [[ ! -f "dependencies/bin/premake5" ]]; then
if [[ $machine = "macosx" ]]; then
# v5.0.0-beta2 doesn't support apple silicon properly, update the branch
# once a stable one is avaialble that supports it
git clone --depth 1 --branch master https://github.com/premake/premake-core.git
git clone --depth 1 --branch v5.0.0-beta3 https://github.com/premake/premake-core.git
pushd premake-core
if [[ $LOCAL_ARCH == "arm64" ]]; then
PREMAKE_MAKE_ARCH=ARM