From c41468354afc0e8dbc3a2fb3f25d936e7f5646d1 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Thu, 1 Nov 2012 07:10:06 -0700
Subject: [PATCH] Convert msbuild projects to vs 2012 format

---
 aegisub/build/Aegisub/Aegisub.vcxproj         |  20 +-
 aegisub/build/csrihelper/csrihelper.vcxproj   |  12 +
 .../csrihelper/csrihelper.vcxproj.filters     |  28 +-
 aegisub/build/hunspell/hunspell.vcxproj       |  12 +
 aegisub/build/libaegisub/libaegisub.vcxproj   |  14 +-
 aegisub/build/libiconv/libiconv.vcxproj       |  12 +
 .../build/libiconv/libiconv.vcxproj.filters   | 668 +-----------------
 aegisub/build/libresrc/libresrc.vcxproj       |  40 +-
 .../build/libresrc/libresrc.vcxproj.filters   |  24 +-
 aegisub/build/lua51/lua51.vcxproj             |  17 +-
 aegisub/build/respack/respack.vcxproj         |   8 +-
 .../universalchardet/universalchardet.vcxproj |  12 +
 12 files changed, 153 insertions(+), 714 deletions(-)

diff --git a/aegisub/build/Aegisub/Aegisub.vcxproj b/aegisub/build/Aegisub/Aegisub.vcxproj
index aa7175085..2250f86e1 100644
--- a/aegisub/build/Aegisub/Aegisub.vcxproj
+++ b/aegisub/build/Aegisub/Aegisub.vcxproj
@@ -23,6 +23,18 @@
     <ProjectGuid>{9DDDB9E5-E4A1-423D-A224-F6D4E5AAC06A}</ProjectGuid>
     <RootNamespace>Aegisub</RootNamespace>
   </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
   <!-- Aegisub project configuration -->
   <PropertyGroup Label="AegisubConfiguration">
     <AegisubProjectType>exe</AegisubProjectType>
@@ -334,11 +346,13 @@
     <ClCompile Include="$(SrcDir)main.cpp" />
     <ClCompile Include="$(SrcDir)MatroskaParser.c">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <ForcedIncludeFiles></ForcedIncludeFiles>
+      <ForcedIncludeFiles>
+      </ForcedIncludeFiles>
     </ClCompile>
     <ClCompile Include="$(SrcDir)md5.c">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <ForcedIncludeFiles></ForcedIncludeFiles>
+      <ForcedIncludeFiles>
+      </ForcedIncludeFiles>
     </ClCompile>
     <ClCompile Include="$(SrcDir)menu.cpp" />
     <ClCompile Include="$(SrcDir)mkv_wrap.cpp" />
@@ -409,4 +423,4 @@
   <ItemGroup>
     <ResourceCompile Include="$(SrcDir)res.rc" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/aegisub/build/csrihelper/csrihelper.vcxproj b/aegisub/build/csrihelper/csrihelper.vcxproj
index b302a54fd..85d071514 100644
--- a/aegisub/build/csrihelper/csrihelper.vcxproj
+++ b/aegisub/build/csrihelper/csrihelper.vcxproj
@@ -23,6 +23,18 @@
     <ProjectGuid>{C832EAF3-860D-4373-A02C-933626B47A5E}</ProjectGuid>
     <RootNamespace>csrihelper</RootNamespace>
   </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
   <!-- Aegisub project configuration -->
   <PropertyGroup Label="AegisubConfiguration">
     <AegisubProjectType>lib</AegisubProjectType>
diff --git a/aegisub/build/csrihelper/csrihelper.vcxproj.filters b/aegisub/build/csrihelper/csrihelper.vcxproj.filters
index 81472ac59..a6a0f8acf 100644
--- a/aegisub/build/csrihelper/csrihelper.vcxproj.filters
+++ b/aegisub/build/csrihelper/csrihelper.vcxproj.filters
@@ -15,48 +15,48 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\contrib\csri\include\subhelp.h">
+    <ClInclude Include="$(SrcDir)include\csri\csri.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\csri\include\visibility.h">
+    <ClInclude Include="$(SrcDir)include\csri\fmtids.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\csri\include\csri\csri.h">
+    <ClInclude Include="$(SrcDir)include\csri\logging.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\csri\include\csri\fmtids.h">
+    <ClInclude Include="$(SrcDir)include\csri\openerr.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\csri\include\csri\logging.h">
+    <ClInclude Include="$(SrcDir)include\csri\stream.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\csri\include\csri\openerr.h">
+    <ClInclude Include="$(SrcDir)include\subhelp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\csri\include\csri\stream.h">
+    <ClInclude Include="$(SrcDir)include\visibility.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\csri\lib\csrilib.h">
+    <ClInclude Include="$(SrcDir)lib\csrilib.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\csri\lib\win32\csrilib_os.h">
+    <ClInclude Include="$(SrcDir)lib\win32\csrilib_os.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\..\contrib\csri\lib\list.c">
+    <ClCompile Include="$(SrcDir)lib\list.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\contrib\csri\lib\wrap.c">
+    <ClCompile Include="$(SrcDir)lib\win32\enumerate.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\contrib\csri\lib\win32\enumerate.c">
+    <ClCompile Include="$(SrcDir)lib\wrap.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\contrib\csri\subhelp\logging.c">
+    <ClCompile Include="$(SrcDir)subhelp\logging.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\contrib\csri\subhelp\win32\openfile.c">
+    <ClCompile Include="$(SrcDir)subhelp\win32\openfile.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/aegisub/build/hunspell/hunspell.vcxproj b/aegisub/build/hunspell/hunspell.vcxproj
index 589752f6f..256684745 100644
--- a/aegisub/build/hunspell/hunspell.vcxproj
+++ b/aegisub/build/hunspell/hunspell.vcxproj
@@ -23,6 +23,18 @@
     <ProjectGuid>{CC791693-6B28-40AC-879D-64A6C16468E3}</ProjectGuid>
     <RootNamespace>hunspell</RootNamespace>
   </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
   <!-- Aegisub project configuration -->
   <PropertyGroup Label="AegisubConfiguration">
     <AegisubProjectType>lib</AegisubProjectType>
diff --git a/aegisub/build/libaegisub/libaegisub.vcxproj b/aegisub/build/libaegisub/libaegisub.vcxproj
index 9f7337eb2..3e142cab2 100644
--- a/aegisub/build/libaegisub/libaegisub.vcxproj
+++ b/aegisub/build/libaegisub/libaegisub.vcxproj
@@ -23,6 +23,18 @@
     <ProjectGuid>{BB3FED86-DB7A-4DC7-964A-260FB86CDE61}</ProjectGuid>
     <RootNamespace>libaegisub</RootNamespace>
   </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
   <!-- Aegisub project configuration -->
   <PropertyGroup Label="AegisubConfiguration">
     <AegisubProjectType>lib</AegisubProjectType>
@@ -113,4 +125,4 @@
   <ItemGroup>
     <None Include="$(SrcDir)include\libaegisub\charsets.def" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/aegisub/build/libiconv/libiconv.vcxproj b/aegisub/build/libiconv/libiconv.vcxproj
index 8d5e0b26a..ca3a07b78 100644
--- a/aegisub/build/libiconv/libiconv.vcxproj
+++ b/aegisub/build/libiconv/libiconv.vcxproj
@@ -23,6 +23,18 @@
     <ProjectGuid>{965054D2-44F2-4EB2-9879-051CC3D7EF08}</ProjectGuid>
     <RootNamespace>libiconv</RootNamespace>
   </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
   <!-- Aegisub project configuration -->
   <PropertyGroup Label="AegisubConfiguration">
     <AegisubProjectType>lib</AegisubProjectType>
diff --git a/aegisub/build/libiconv/libiconv.vcxproj.filters b/aegisub/build/libiconv/libiconv.vcxproj.filters
index b37f822da..7d37f861a 100644
--- a/aegisub/build/libiconv/libiconv.vcxproj.filters
+++ b/aegisub/build/libiconv/libiconv.vcxproj.filters
@@ -15,681 +15,27 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\aliases.h">
+    <ClInclude Include="$(SrcDir)include\iconv.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\aliases_aix.h">
+    <ClInclude Include="$(SrcDir)include\libcharset.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\aliases_aix_sysaix.h">
+    <ClInclude Include="$(SrcDir)include\localcharset.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\aliases_dos.h">
+    <ClInclude Include="$(SrcDir)libcharset\config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\aliases_extra.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\aliases_osf1.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\aliases_osf1_sysosf1.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\aliases_sysaix.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\aliases_syshpux.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\aliases_sysosf1.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\aliases_syssolaris.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\aliases2.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\armscii_8.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\ascii.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\atarist.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\big5.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\big5_2003.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\big5hkscs1999.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\big5hkscs2001.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\big5hkscs2004.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\c99.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\canonical.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\canonical_aix.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\canonical_aix_sysaix.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\canonical_dos.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\canonical_extra.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\canonical_local.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\canonical_local_sysaix.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\canonical_local_syshpux.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\canonical_local_sysosf1.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\canonical_local_syssolaris.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\canonical_osf1.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\canonical_osf1_sysosf1.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\canonical_sysaix.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\canonical_syshpux.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\canonical_sysosf1.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\canonical_syssolaris.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\ces_big5.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\ces_gbk.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cjk_variants.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cns11643.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cns11643_1.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cns11643_2.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cns11643_3.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cns11643_4.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cns11643_4a.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cns11643_4b.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cns11643_5.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cns11643_6.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cns11643_7.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cns11643_15.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cns11643_inv.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\config.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\converters.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cp437.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cp737.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cp775.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cp850.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cp852.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cp853.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cp855.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cp856.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cp857.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cp858.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cp860.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cp861.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cp862.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cp863.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cp864.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cp865.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cp866.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cp869.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cp874.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cp922.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cp932.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cp932ext.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cp936.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cp936ext.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cp943.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cp949.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cp950.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cp950ext.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cp1046.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cp1124.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cp1125.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cp1129.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cp1131.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cp1133.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cp1161.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cp1162.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cp1163.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cp1250.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cp1251.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cp1252.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cp1253.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cp1254.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cp1255.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cp1256.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cp1257.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\cp1258.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\dec_hanyu.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\dec_kanji.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\euc_cn.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\euc_jisx0213.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\euc_jp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\euc_kr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\euc_tw.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\flags.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\flushwc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\gb2312.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\gb12345.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\gb12345ext.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\gb18030.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\gb18030ext.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\gb18030uni.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\gbk.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\gbkext_inv.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\gbkext1.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\gbkext2.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\georgian_academy.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\georgian_ps.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\hkscs1999.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\hkscs2001.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\hkscs2004.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\hp_roman8.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\hz.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\iconv_open1.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\iconv_open2.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\iso646_cn.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\iso646_jp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\iso2022_cn.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\iso2022_cnext.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\iso2022_jp.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\iso2022_jp1.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\iso2022_jp2.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\iso2022_jp3.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\iso2022_kr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\iso8859_1.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\iso8859_2.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\iso8859_3.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\iso8859_4.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\iso8859_5.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\iso8859_6.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\iso8859_7.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\iso8859_8.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\iso8859_9.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\iso8859_10.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\iso8859_11.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\iso8859_13.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\iso8859_14.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\iso8859_15.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\iso8859_16.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\isoir165.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\isoir165ext.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\java.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\jisx0201.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\jisx0208.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\jisx0212.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\jisx0213.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\johab.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\johab_hangul.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\koi8_r.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\koi8_ru.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\koi8_t.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\koi8_u.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\ksc5601.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\libcharset.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\localcharset.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\loop_unicode.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\loop_wchar.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\loops.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\mac_arabic.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\mac_centraleurope.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\mac_croatian.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\mac_cyrillic.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\mac_greek.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\mac_hebrew.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\mac_iceland.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\mac_roman.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\mac_romania.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\mac_thai.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\mac_turkish.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\mac_ukraine.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\mulelao.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\nextstep.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\pt154.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\relocatable.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\riscos1.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\rk1048.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\shift_jisx0213.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\sjis.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\tcvn.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\tds565.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\tis620.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\translit.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\ucs2.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\ucs2be.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\ucs2internal.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\ucs2le.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\ucs2swapped.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\ucs4.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\ucs4be.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\ucs4internal.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\ucs4le.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\ucs4swapped.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\uhc_1.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\uhc_2.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\utf7.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\utf8.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\utf16.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\utf16be.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\utf16le.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\utf32.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\utf32be.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\utf32le.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\vietcomb.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libiconv\viscii.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libcharset\config.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\libcharset\relocatable.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\include\iconv.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\include\libcharset.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\include\localcharset.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\contrib\iconv\include\stdbool.h">
+    <ClInclude Include="$(SrcDir)libiconv\config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\..\contrib\iconv\libiconv\iconv.c">
+    <ClCompile Include="$(SrcDir)libcharset\localcharset.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\contrib\iconv\libcharset\localcharset.c">
+    <ClCompile Include="$(SrcDir)libiconv\iconv.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/aegisub/build/libresrc/libresrc.vcxproj b/aegisub/build/libresrc/libresrc.vcxproj
index f22e165a0..84b5f6e7d 100644
--- a/aegisub/build/libresrc/libresrc.vcxproj
+++ b/aegisub/build/libresrc/libresrc.vcxproj
@@ -23,11 +23,23 @@
     <ProjectGuid>{BD00D65F-24DA-4784-8860-3B972EA125FC}</ProjectGuid>
     <RootNamespace>libresrc</RootNamespace>
   </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
   <!-- Aegisub project configuration -->
   <PropertyGroup Label="AegisubConfiguration">
     <AegisubProjectType>lib</AegisubProjectType>
-	<AegisubUseWxWidgets>true</AegisubUseWxWidgets>
-	<SrcDir>..\..\..\src\libresrc\</SrcDir>
+    <AegisubUseWxWidgets>true</AegisubUseWxWidgets>
+    <SrcDir>..\..\..\src\libresrc\</SrcDir>
   </PropertyGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
@@ -37,23 +49,23 @@
     <ClCompile>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-	<ResPack>
-		<OutputDir>$(MSBuildThisFileDirectory)..\..\..\src\libresrc\</OutputDir>
-	</ResPack>
+    <ResPack>
+      <OutputDir>$(MSBuildThisFileDirectory)..\..\..\src\libresrc\</OutputDir>
+    </ResPack>
   </ItemDefinitionGroup>
   <ImportGroup Label="ExtensionTargets">
-	<Import Project="$(MSBuildThisFileDirectory)..\respack\Aegisub.ResPack.targets" />
+    <Import Project="$(MSBuildThisFileDirectory)..\respack\Aegisub.ResPack.targets" />
   </ImportGroup>
   <!-- Source files -->
   <ItemGroup>
-	<ResPack Include="..\..\..\src\libresrc\manifest.respack">
-		<OutputName>default_config.cpp</OutputName>
-		<OutputHeader>default_config.h</OutputHeader>
-	</ResPack>
-	<ResPack Include="..\..\..\src\bitmaps\manifest.respack">
-		<OutputName>bitmap.cpp</OutputName>
-		<OutputHeader>bitmap.h</OutputHeader>
-	</ResPack>
+    <ResPack Include="..\..\..\src\libresrc\manifest.respack">
+      <OutputName>default_config.cpp</OutputName>
+      <OutputHeader>default_config.h</OutputHeader>
+    </ResPack>
+    <ResPack Include="..\..\..\src\bitmaps\manifest.respack">
+      <OutputName>bitmap.cpp</OutputName>
+      <OutputHeader>bitmap.h</OutputHeader>
+    </ResPack>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="$(SrcDir)libresrc.cpp" />
diff --git a/aegisub/build/libresrc/libresrc.vcxproj.filters b/aegisub/build/libresrc/libresrc.vcxproj.filters
index e2d7edefd..7c04e25ae 100644
--- a/aegisub/build/libresrc/libresrc.vcxproj.filters
+++ b/aegisub/build/libresrc/libresrc.vcxproj.filters
@@ -15,32 +15,20 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-	<ResPack Include="..\..\..\src\libresrc\manifest.respack">
+    <ResPack Include="..\..\..\src\libresrc\manifest.respack">
       <Filter>Resource Files</Filter>
-	</ResPack>
-	<ResPack Include="..\..\..\src\bitmaps\manifest.respack">
+    </ResPack>
+    <ResPack Include="..\..\..\src\bitmaps\manifest.respack">
       <Filter>Resource Files</Filter>
-	</ResPack>
+    </ResPack>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\src\libresrc\bitmap.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\src\libresrc\default_config.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\src\libresrc\libresrc.cpp">
+    <ClCompile Include="$(SrcDir)libresrc.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\src\libresrc\bitmap.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\src\libresrc\default_config.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\src\libresrc\libresrc.h">
+    <ClInclude Include="$(SrcDir)libresrc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/aegisub/build/lua51/lua51.vcxproj b/aegisub/build/lua51/lua51.vcxproj
index 0ed05969e..9a0b1fb94 100644
--- a/aegisub/build/lua51/lua51.vcxproj
+++ b/aegisub/build/lua51/lua51.vcxproj
@@ -23,10 +23,22 @@
     <ProjectGuid>{5391A8B1-9C70-4DC4-92AD-D3E34C6B803F}</ProjectGuid>
     <RootNamespace>lua51</RootNamespace>
   </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
   <!-- Aegisub project configuration -->
   <PropertyGroup Label="AegisubConfiguration">
     <AegisubProjectType>dll</AegisubProjectType>
-	<SrcDir>..\..\..\..\contrib\lua51\src\</SrcDir>
+    <SrcDir>..\..\..\..\contrib\lua51\src\</SrcDir>
   </PropertyGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(MSBuildThisFileDirectory)..\aegisub.props" />
@@ -35,7 +47,8 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <PreprocessorDefinitions>LUA_BUILD_AS_DLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-	  <CompileAs>CompileAsCpp</CompileAs> <!-- We want to build Lua as C++ to get C++ name mangling -->
+      <CompileAs>CompileAsCpp</CompileAs>
+      <!-- We want to build Lua as C++ to get C++ name mangling -->
     </ClCompile>
   </ItemDefinitionGroup>
   <!-- Source files -->
diff --git a/aegisub/build/respack/respack.vcxproj b/aegisub/build/respack/respack.vcxproj
index dc6922422..bb491fd87 100644
--- a/aegisub/build/respack/respack.vcxproj
+++ b/aegisub/build/respack/respack.vcxproj
@@ -15,6 +15,12 @@
     <ProjectGuid>{08AF2BCC-FCDD-4F0E-8B41-59A6E634F2E8}</ProjectGuid>
     <RootNamespace>respack</RootNamespace>
   </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
   <!-- Aegisub project configuration -->
   <PropertyGroup Label="AegisubConfiguration">
     <AegisubProjectType>exe</AegisubProjectType>
@@ -26,7 +32,7 @@
   <PropertyGroup>
     <OutDir>$(ProjectDir)</OutDir>
     <TargetName>respack</TargetName>
-	<TargetName Condition="'$(Platform)'=='x64'">%(TargetName)64</TargetName>
+    <TargetName Condition="'$(Platform)'=='x64'">%(TargetName)64</TargetName>
     <TargetName Condition="'$(Configuration)'=='Debug'">%(TargetName)d</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup>
diff --git a/aegisub/build/universalchardet/universalchardet.vcxproj b/aegisub/build/universalchardet/universalchardet.vcxproj
index 1bd071cca..d9f5413bc 100644
--- a/aegisub/build/universalchardet/universalchardet.vcxproj
+++ b/aegisub/build/universalchardet/universalchardet.vcxproj
@@ -23,6 +23,18 @@
     <ProjectGuid>{7B56955D-5162-4698-AA5B-47484EDC8783}</ProjectGuid>
     <RootNamespace>universalchardet</RootNamespace>
   </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
   <!-- Aegisub project configuration -->
   <PropertyGroup Label="AegisubConfiguration">
     <AegisubProjectType>lib</AegisubProjectType>