Update with latest PLS
diff --git a/path_fiddle/path_fiddle.cpp b/path_fiddle/path_fiddle.cpp index 55efe15..72089cb 100644 --- a/path_fiddle/path_fiddle.cpp +++ b/path_fiddle/path_fiddle.cpp
@@ -400,13 +400,13 @@ } else if (!strcmp(argv[i], "--sw") || !strcmp(argv[i], "--swiftshader")) { - // Use the swiftshader built by packages/pls/make_swiftshader.sh + // Use the swiftshader built by packages/runtime/pls/make_swiftshader.sh set_environment_variable("VK_ICD_FILENAMES", kSwiftShaderICD); api = API::vulkan; } else if (!strcmp(argv[i], "--swatomic") || !strcmp(argv[i], "--swiftshaderatomic")) { - // Use the swiftshader built by packages/pls/make_swiftshader.sh + // Use the swiftshader built by packages/runtime/pls/make_swiftshader.sh set_environment_variable("VK_ICD_FILENAMES", kSwiftShaderICD); api = API::vulkan; s_forceAtomicMode = true;
diff --git a/premake5.lua b/premake5.lua index c00f2d4..f7855d4 100644 --- a/premake5.lua +++ b/premake5.lua
@@ -138,7 +138,7 @@ '-sUSE_GLFW=3', '-sMIN_WEBGL_VERSION=2', '-sMAX_WEBGL_VERSION=2', - '--preload-file ' .. path.getabsolute('../../gold') .. '/rivs@/', + '--preload-file ' .. path.getabsolute('../../../gold') .. '/rivs@/', }) files({ 'path_fiddle/index.html' }) end @@ -180,30 +180,30 @@ 'webgpu_player/index.html', 'webgpu_player/icons.html', 'webgpu_player/rive.js', - '../../gold/rivs/Santa_Claus.riv', - '../../gold/rivs/Coffee_Cup.riv', - '../../gold/rivs/skull_404.riv', - '../../gold/rivs/octopus_loop.riv', - '../../gold/rivs/planets.riv', - '../../gold/rivs/Timer.riv', - '../../gold/rivs/adventuretime_marceline-pb.riv', - '../../gold/rivs/towersDemo.riv', - '../../gold/rivs/skills_demov1.riv', - '../../gold/rivs/car_demo.riv', - '../../gold/rivs/cloud_icon.riv', - '../../gold/rivs/coffee_loader.riv', - '../../gold/rivs/documentation.riv', - '../../gold/rivs/fire_button.riv', - '../../gold/rivs/lumberjackfinal.riv', - '../../gold/rivs/mail_box.riv', - '../../gold/rivs/new_file.riv', - '../../gold/rivs/poison_loader.riv', - '../../gold/rivs/popsicle_loader.riv', - '../../gold/rivs/radio_button_example.riv', - '../../gold/rivs/avatar_demo.riv', - '../../gold/rivs/stopwatch.riv', - '../../gold/rivs/volume_bars.riv', - '../../gold/rivs/travel_icons.riv', + '../../../gold/rivs/Santa_Claus.riv', + '../../../gold/rivs/Coffee_Cup.riv', + '../../../gold/rivs/skull_404.riv', + '../../../gold/rivs/octopus_loop.riv', + '../../../gold/rivs/planets.riv', + '../../../gold/rivs/Timer.riv', + '../../../gold/rivs/adventuretime_marceline-pb.riv', + '../../../gold/rivs/towersDemo.riv', + '../../../gold/rivs/skills_demov1.riv', + '../../../gold/rivs/car_demo.riv', + '../../../gold/rivs/cloud_icon.riv', + '../../../gold/rivs/coffee_loader.riv', + '../../../gold/rivs/documentation.riv', + '../../../gold/rivs/fire_button.riv', + '../../../gold/rivs/lumberjackfinal.riv', + '../../../gold/rivs/mail_box.riv', + '../../../gold/rivs/new_file.riv', + '../../../gold/rivs/poison_loader.riv', + '../../../gold/rivs/popsicle_loader.riv', + '../../../gold/rivs/radio_button_example.riv', + '../../../gold/rivs/avatar_demo.riv', + '../../../gold/rivs/stopwatch.riv', + '../../../gold/rivs/volume_bars.riv', + '../../../gold/rivs/travel_icons.riv', }) links({
diff --git a/premake5_pls_renderer.lua b/premake5_pls_renderer.lua index cf9d76e..0980e1f 100644 --- a/premake5_pls_renderer.lua +++ b/premake5_pls_renderer.lua
@@ -1,16 +1,6 @@ dofile('rive_build_config.lua') --- Are we in the "rive-renderer" or "rive" repository? -local handle = io.popen('git remote -v') -local git_remote = handle:read('*a') -handle:close() -if string.find(git_remote, 'rive%-renderer') or string.find(git_remote, 'rive%-pls') then - -- In rive-renderer. Rive runtime is a submodule. - RIVE_RUNTIME_DIR = path.getabsolute('submodules/rive-cpp') -else - -- In rive. Rive runtime is further up the tree. - RIVE_RUNTIME_DIR = path.getabsolute('../runtime') -end +RIVE_RUNTIME_DIR = path.getabsolute('..') newoption({ trigger = 'with_vulkan', @@ -165,7 +155,7 @@ 'include', 'glad', 'renderer', - RIVE_RUNTIME_DIR .. '/include', + '../include', pls_generated_headers, }) flags({ 'FatalWarnings' }) @@ -271,7 +261,7 @@ filter({ 'options:not no-rive-decoders' }) do - includedirs({ RIVE_RUNTIME_DIR .. '/decoders/include' }) + includedirs({ '../decoders/include' }) defines({ 'RIVE_DECODERS' }) end
diff --git a/rive_vk_bootstrap/bootstrap_project.lua b/rive_vk_bootstrap/bootstrap_project.lua index 68608bf..91f8866 100644 --- a/rive_vk_bootstrap/bootstrap_project.lua +++ b/rive_vk_bootstrap/bootstrap_project.lua
@@ -4,7 +4,7 @@ end if not vulkan_headers or not vulkan_memory_allocator then - error('Please `dofile` packages/pls/premake5_pls_renderer.lua first.') + error('Please `dofile` packages/runtime/pls/premake5_pls_renderer.lua first.') end local dependency = require('dependency')