From 288e0ccbdd93a58a94403e9cfbc8df4965ad2e1b Mon Sep 17 00:00:00 2001
From: Berke Viktor <bviktor@hexchat.org>
Date: Wed, 3 Oct 2012 20:51:44 +0200
Subject: [PATCH] Fix the remaining path breakages after the downgrade

---
 .../deps/freetype/builds/win32/vc10/freetype.vcxproj | 12 ++++++------
 win32/deps/freetype/release-x64.bat                  |  2 +-
 win32/deps/freetype/release-x86.bat                  |  2 +-
 win32/deps/libffi/build-x64.bat                      |  2 +-
 win32/deps/libffi/build-x86.bat                      |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/win32/deps/freetype/builds/win32/vc10/freetype.vcxproj b/win32/deps/freetype/builds/win32/vc10/freetype.vcxproj
index a51d35d9..f041d1ad 100644
--- a/win32/deps/freetype/builds/win32/vc10/freetype.vcxproj
+++ b/win32/deps/freetype/builds/win32/vc10/freetype.vcxproj
@@ -119,17 +119,17 @@
   </ImportGroup>
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\..\..\objs\win32\vc2012\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\..\..\objs\win32\vc10\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\..\..\objs\release\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">.\..\..\..\objs\win32\vc2012\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">.\..\..\..\objs\win32\vc10\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'">.\..\..\..\objs\release_mt\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">.\..\..\..\objs\win32\vc2012\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">.\..\..\..\objs\win32\vc10\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'">.\..\..\..\objs\release_st\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\..\..\objs\win32\vc2012\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\..\..\objs\win32\vc10\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\..\..\..\objs\debug\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">.\..\..\..\objs\win32\vc2012\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">.\..\..\..\objs\win32\vc10\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'">.\..\..\..\objs\debug_st\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">.\..\..\..\objs\win32\vc2012\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">.\..\..\..\objs\win32\vc10\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">.\..\..\..\objs\debug_mt\</IntDir>
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
diff --git a/win32/deps/freetype/release-x64.bat b/win32/deps/freetype/release-x64.bat
index e1287db3..fd7f8ad8 100644
--- a/win32/deps/freetype/release-x64.bat
+++ b/win32/deps/freetype/release-x64.bat
@@ -16,7 +16,7 @@ mkdir %FREETYPE_DEST%\share
 mkdir %FREETYPE_DEST%\share\doc
 mkdir %FREETYPE_DEST%\share\doc\freetype
 xcopy /s include %FREETYPE_DEST%\include\
-copy builds\win32\vc2012\x64\Release\freetype2410.lib %FREETYPE_DEST%\lib\freetype.lib
+copy builds\win32\vc10\x64\Release\freetype2410.lib %FREETYPE_DEST%\lib\freetype.lib
 copy docs\LICENSE.TXT %FREETYPE_DEST%\share\doc\freetype\COPYING
 
 cd %FREETYPE_DEST%
diff --git a/win32/deps/freetype/release-x86.bat b/win32/deps/freetype/release-x86.bat
index cdd5a307..5e0be979 100644
--- a/win32/deps/freetype/release-x86.bat
+++ b/win32/deps/freetype/release-x86.bat
@@ -16,7 +16,7 @@ mkdir %FREETYPE_DEST%\share
 mkdir %FREETYPE_DEST%\share\doc
 mkdir %FREETYPE_DEST%\share\doc\freetype
 xcopy /s include %FREETYPE_DEST%\include\
-copy objs\win32\vc2012\freetype2410.lib %FREETYPE_DEST%\lib\freetype.lib
+copy objs\win32\vc10\freetype2410.lib %FREETYPE_DEST%\lib\freetype.lib
 copy docs\LICENSE.TXT %FREETYPE_DEST%\share\doc\freetype\COPYING
 
 cd %FREETYPE_DEST%
diff --git a/win32/deps/libffi/build-x64.bat b/win32/deps/libffi/build-x64.bat
index d80c2416..c4d1fd70 100644
--- a/win32/deps/libffi/build-x64.bat
+++ b/win32/deps/libffi/build-x64.bat
@@ -1,4 +1,4 @@
-#run this from mozilla-build\start-msvc11-x64.bat
+#run this from mozilla-build\start-msvc10-x64.bat
 #cd /c/mozilla-build/hexchat/libffi-3.0.11
 #TODO: use own zlib build instead of mozilla-build one
 
diff --git a/win32/deps/libffi/build-x86.bat b/win32/deps/libffi/build-x86.bat
index dd7c3870..2b6e62c9 100644
--- a/win32/deps/libffi/build-x86.bat
+++ b/win32/deps/libffi/build-x86.bat
@@ -1,4 +1,4 @@
-#run this from mozilla-build\start-msvc11.bat
+#run this from mozilla-build\start-msvc10.bat
 #cd /c/mozilla-build/hexchat/libffi-3.0.11
 #TODO: use own zlib build instead of mozilla-build one