From 5c41a8f0f994d3ff910298b7b39bf0c4076e89a6 Mon Sep 17 00:00:00 2001
From: Ben Vanik <ben.vanik@gmail.com>
Date: Wed, 3 Jun 2015 22:35:05 -0700
Subject: [PATCH] Fixing Checked builds.

---
 build/Xenia.Cpp.x64.Common.props | 2 +-
 build/Xenia.Cpp.x64.Debug.props  | 3 +++
 libxenia.vcxproj                 | 3 ---
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/Xenia.Cpp.x64.Common.props b/build/Xenia.Cpp.x64.Common.props
index fc379a2ea..c63850297 100644
--- a/build/Xenia.Cpp.x64.Common.props
+++ b/build/Xenia.Cpp.x64.Common.props
@@ -21,7 +21,7 @@
       <AdditionalDependencies>ntdll.lib;wsock32.lib;ws2_32.lib;xinput.lib;xaudio2.lib;glu32.lib;opengl32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <Lib>
-      <AdditionalLibraryDirectories>$(SolutionDir)build\bin\$(Configuration)\</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)build\bin\$(Configuration)\;$(SolutionDir)third_party\libav-bin\lib\$(Configuration)</AdditionalLibraryDirectories>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup />
diff --git a/build/Xenia.Cpp.x64.Debug.props b/build/Xenia.Cpp.x64.Debug.props
index 30c2e2af1..de20e3fd1 100644
--- a/build/Xenia.Cpp.x64.Debug.props
+++ b/build/Xenia.Cpp.x64.Debug.props
@@ -14,6 +14,9 @@
     <Link>
       <GenerateDebugInformation>Debug</GenerateDebugInformation>
     </Link>
+    <Lib>
+      <AdditionalLibraryDirectories>$(SolutionDir)third_party\libav-bin\lib\Debug\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Lib>
   </ItemDefinitionGroup>
   <ItemGroup />
 </Project>
\ No newline at end of file
diff --git a/libxenia.vcxproj b/libxenia.vcxproj
index b6f8f7589..a5d8b1774 100644
--- a/libxenia.vcxproj
+++ b/libxenia.vcxproj
@@ -510,7 +510,6 @@
     </Link>
     <Lib>
       <AdditionalDependencies>libavcodec.a;libavutil.a;libgflags.lib;libglew.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)third_party\libav-bin\lib\$(Configuration);$(SolutionDir)build\bin\$(Configuration)\</AdditionalLibraryDirectories>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Checked|x64'">
@@ -528,7 +527,6 @@
     </Link>
     <Lib>
       <AdditionalDependencies>libavcodec.a;libavutil.a;libgflags.lib;libglew.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)third_party\libav-bin\lib\$(Configuration);$(SolutionDir)build\bin\$(Configuration)\</AdditionalLibraryDirectories>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -550,7 +548,6 @@
     </Link>
     <Lib>
       <AdditionalDependencies>libavcodec.a;libavutil.a;libgflags.lib;libglew.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)third_party\libav-bin\lib\$(Configuration);$(SolutionDir)build\bin\$(Configuration)\</AdditionalLibraryDirectories>
     </Lib>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />