From 306a744a0c3e521ebf3ea396c5711f71b05c21a9 Mon Sep 17 00:00:00 2001 From: rivessamr Date: Sat, 24 Aug 2024 00:01:52 +0000 Subject: [PATCH] Fix viewer tess builds The following now builds and runs as per README in viewer: ./build_viewer.sh gl tess run Diffs= 7d00d35d3 Fix viewer tess builds (#7935) Co-authored-by: rivessamr --- .rive_head | 2 +- tess/build/premake5_tess.lua | 10 ++++++++++ viewer/build/premake5_viewer.lua | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.rive_head b/.rive_head index 92d78fed..1fc98f24 100644 --- a/.rive_head +++ b/.rive_head @@ -1 +1 @@ -455ebad60a07f5cbb8787f42cbf54094b7dc6772 +7d00d35d336f53c12c04fb7c2288e526ba5ec789 diff --git a/tess/build/premake5_tess.lua b/tess/build/premake5_tess.lua index 7f93b186..a089766c 100644 --- a/tess/build/premake5_tess.lua +++ b/tess/build/premake5_tess.lua @@ -87,6 +87,16 @@ do buildoptions({ '-Wall', '-fno-exceptions', '-fno-rtti', '-Werror=format' }) defines({ 'TESTING', 'YOGA_EXPORT=' }) + filter({ 'system:macosx' }) + do + links({ + 'Cocoa.framework', + 'IOKit.framework', + 'CoreVideo.framework', + 'OpenGL.framework', + }) + end + filter('configurations:debug') do buildoptions({ '-g' }) diff --git a/viewer/build/premake5_viewer.lua b/viewer/build/premake5_viewer.lua index 725da540..b477fbe3 100644 --- a/viewer/build/premake5_viewer.lua +++ b/viewer/build/premake5_viewer.lua @@ -8,7 +8,7 @@ rive_skia = '../../skia' skia = dependencies .. '/skia' if _OPTIONS.renderer == 'tess' then - dofile(rive .. '/decoders/build/premake5.lua') + dofile(rive .. '/decoders/premake5_v2.lua') dofile(path.join(path.getabsolute(rive_tess) .. '/build', 'premake5_tess.lua')) else -- tess renderer includes this