MSBuild: Only link with Zydis in Debug builds

stenzek · Dec 18, 2023 · 2f0ab38 · 2f0ab38
1 parent f2f84d6
commit 2f0ab38
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/duckstation.sln b/duckstation.sln
@@ -961,16 +961,12 @@ Global
 		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.DebugFast-Clang|x64.Build.0 = DebugFast-Clang|x64
 		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.Release|ARM64.ActiveCfg = Release|ARM64
 		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.Release|x64.ActiveCfg = Release|x64
-		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.Release|x64.Build.0 = Release|x64
 		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.Release-Clang|ARM64.ActiveCfg = Release-Clang|ARM64
 		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.Release-Clang|x64.ActiveCfg = Release-Clang|x64
-		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.Release-Clang|x64.Build.0 = Release-Clang|x64
 		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.ReleaseLTCG|ARM64.ActiveCfg = ReleaseLTCG|ARM64
 		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.ReleaseLTCG|x64.ActiveCfg = ReleaseLTCG|x64
-		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.ReleaseLTCG|x64.Build.0 = ReleaseLTCG|x64
 		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.ReleaseLTCG-Clang|ARM64.ActiveCfg = ReleaseLTCG-Clang|ARM64
 		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.ReleaseLTCG-Clang|x64.ActiveCfg = ReleaseLTCG-Clang|x64
-		{C51A346A-86B2-46DF-9BB3-D0AA7E5D8699}.ReleaseLTCG-Clang|x64.Build.0 = ReleaseLTCG-Clang|x64
 		{F351C4D8-594A-4850-B77B-3C1249812CCE}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{F351C4D8-594A-4850-B77B-3C1249812CCE}.Debug|ARM64.Build.0 = Debug|ARM64
 		{F351C4D8-594A-4850-B77B-3C1249812CCE}.Debug|x64.ActiveCfg = Debug|x64

diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj
@@ -190,7 +190,7 @@
     <ProjectReference Include="..\..\dep\zstd\zstd.vcxproj">
       <Project>{73ee0c55-6ffe-44e7-9c12-baa52434a797}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\dep\zydis\zydis.vcxproj" Condition="'$(Platform)'=='x64'">
+    <ProjectReference Include="..\..\dep\zydis\zydis.vcxproj" Condition="'$(Platform)'=='x64' And $(Configuration.Contains('Debug'))">
       <Project>{c51a346a-86b2-46df-9bb3-d0aa7e5d8699}</Project>
     </ProjectReference>
     <ProjectReference Include="..\scmversion\scmversion.vcxproj">
@@ -207,8 +207,8 @@
   <Import Project="core.props" />
   <ItemDefinitionGroup>
     <ClCompile>
-      <PreprocessorDefinitions Condition="'$(Platform)'=='x64'">ZYDIS_DISABLE_ENCODER;ZYDIS_DISABLE_AVX512;ZYDIS_DISABLE_KNC;ZYDIS_STATIC_BUILD;ZYCORE_STATIC_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories Condition="'$(Platform)'=='x64'">$(SolutionDir)dep\zydis\include;$(SolutionDir)dep\zydis\dependencies\zycore\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Platform)'=='x64' And $(Configuration.Contains('Debug'))">ZYDIS_DISABLE_ENCODER;ZYDIS_DISABLE_AVX512;ZYDIS_DISABLE_KNC;ZYDIS_STATIC_BUILD;ZYCORE_STATIC_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Platform)'=='x64' And $(Configuration.Contains('Debug'))">$(SolutionDir)dep\zydis\include;$(SolutionDir)dep\zydis\dependencies\zycore\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ObjectFileName>$(IntDir)/%(RelativeDir)/</ObjectFileName>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>