Better premake support for Visual Studio * Add a "windows_runtime=dynamic_release" option for Unreal * Enable parallel building Diffs= 66d9f1725 Better premake support for Visual Studio (#7779) Co-authored-by: Chris Dalton <99840794+csmartdalton@users.noreply.github.com>
diff --git a/.rive_head b/.rive_head index 5ee0753..2f45f73 100644 --- a/.rive_head +++ b/.rive_head
@@ -1 +1 @@ -f0da6a7a097a782df5839390097254bbfb8d9a00 +66d9f1725eca90876a29f029de002b2a4f919a19
diff --git a/build/build_rive.sh b/build/build_rive.sh index 9bef073..b3c4f87 100755 --- a/build/build_rive.sh +++ b/build/build_rive.sh
@@ -286,8 +286,8 @@ for TARGET in $@; do MSVC_TARGETS="$MSVC_TARGETS -t:$TARGET" done - echo msbuild.exe "./$RIVE_OUT/rive.sln" -p:UseMultiToolTask=true -m:$NUM_CORES $MSVC_TARGETS - msbuild.exe "./$RIVE_OUT/rive.sln" -p:UseMultiToolTask=true -m:$NUM_CORES $MSVC_TARGETS + echo msbuild.exe "./$RIVE_OUT/rive.sln" $MSVC_TARGETS + msbuild.exe "./$RIVE_OUT/rive.sln" $MSVC_TARGETS ;; *) echo "Unsupported buildsystem $RIVE_BUILD_SYSTEM"
diff --git a/build/rive_build_config.lua b/build/rive_build_config.lua index cfac708..55ebd5c 100644 --- a/build/rive_build_config.lua +++ b/build/rive_build_config.lua
@@ -158,6 +158,7 @@ { 'static', 'Use static runtime' }, { 'dynamic', 'Use dynamic runtime' }, { 'dynamic_debug', 'Use dynamic runtime force debug' }, + { 'dynamic_release', 'Use dynamic runtime force release' }, }, default = 'default', }) @@ -196,6 +197,12 @@ runtime('Debug') end +filter({ 'system:windows', 'options:windows_runtime=dynamic_release' }) +do + staticruntime('off') + runtime('Release') +end + filter('system:windows') do architecture('x64') @@ -285,6 +292,11 @@ }) end +filter({ 'action:vs2022' }) +do + flags({ 'MultiProcessorCompile' }) +end + filter({}) -- Don't use filter() here because we don't want to generate the "android_ndk" toolset if not