From cbc68b42eb52a614aed72fa53ed11846d7c8933c Mon Sep 17 00:00:00 2001 From: Megamouse Date: Wed, 26 Mar 2025 20:27:02 +0100 Subject: [PATCH] VS/MSVC: Move LTCG and GL to CI only This was taking too long on my local builds after simple code changes. --- .github/workflows/rpcs3.yml | 2 +- azure-pipelines.yml | 2 +- buildfiles/msvc/{ci_no_debug_info.targets => ci_only.targets} | 4 ++++ buildfiles/msvc/rpcs3_release.props | 2 -- 4 files changed, 6 insertions(+), 4 deletions(-) rename buildfiles/msvc/{ci_no_debug_info.targets => ci_only.targets} (62%) diff --git a/.github/workflows/rpcs3.yml b/.github/workflows/rpcs3.yml index 81cb881675..e74954e09f 100644 --- a/.github/workflows/rpcs3.yml +++ b/.github/workflows/rpcs3.yml @@ -165,7 +165,7 @@ jobs: - name: Compile RPCS3 shell: pwsh - run: msbuild rpcs3.sln /p:Configuration=Release /v:minimal /p:Platform=x64 /p:CLToolPath=${{ env.CCACHE_BIN_DIR }} /p:UseMultiToolTask=true /p:CustomAfterMicrosoftCommonTargets="${{ github.workspace }}\buildfiles\msvc\ci_no_debug_info.targets" + run: msbuild rpcs3.sln /p:Configuration=Release /v:minimal /p:Platform=x64 /p:CLToolPath=${{ env.CCACHE_BIN_DIR }} /p:UseMultiToolTask=true /p:CustomAfterMicrosoftCommonTargets="${{ github.workspace }}\buildfiles\msvc\ci_only.targets" - name: Pack up build artifacts run: | diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a1401a7e90..ab91b1e8a3 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -121,7 +121,7 @@ jobs: # maximumCpuCount: true # platform: x64 # configuration: 'Release' -# msbuildArgs: /p:CLToolPath=$(CCACHE_BIN_DIR) /p:UseMultiToolTask=true /p:CustomAfterMicrosoftCommonTargets="$(Build.SourcesDirectory)\buildfiles\msvc\ci_no_debug_info.targets" +# msbuildArgs: /p:CLToolPath=$(CCACHE_BIN_DIR) /p:UseMultiToolTask=true /p:CustomAfterMicrosoftCommonTargets="$(Build.SourcesDirectory)\buildfiles\msvc\ci_only.targets" # displayName: Compile RPCS3 # - bash: .ci/deploy-windows.sh diff --git a/buildfiles/msvc/ci_no_debug_info.targets b/buildfiles/msvc/ci_only.targets similarity index 62% rename from buildfiles/msvc/ci_no_debug_info.targets rename to buildfiles/msvc/ci_only.targets index 147806ac97..0275047c3a 100644 --- a/buildfiles/msvc/ci_no_debug_info.targets +++ b/buildfiles/msvc/ci_only.targets @@ -3,6 +3,10 @@ None + true + + UseLinkTimeCodeGeneration + \ No newline at end of file diff --git a/buildfiles/msvc/rpcs3_release.props b/buildfiles/msvc/rpcs3_release.props index 82c8024284..378ba797d6 100644 --- a/buildfiles/msvc/rpcs3_release.props +++ b/buildfiles/msvc/rpcs3_release.props @@ -11,12 +11,10 @@ Speed MultiThreaded LLVM_AVAILABLE;%(PreprocessorDefinitions) - true true true - UseLinkTimeCodeGeneration %(AdditionalLibraryDirectories);$(SolutionDir)build\lib\$(Configuration)-$(Platform)\llvm_build\lib;$(SolutionDir)build\lib_ext\$(Configuration)-$(Platform)\llvm_build\$(Configuration)\lib;$(SolutionDir)build\lib_ext\$(Configuration)-$(Platform)\llvm_build\lib %(AdditionalDependencies);