From 1a61ce84c43b3fceff2781a85554ecb87dce895e Mon Sep 17 00:00:00 2001
From: zilmar <zilmar@pj64-emu.com>
Date: Tue, 20 Oct 2015 10:01:56 +1100
Subject: [PATCH] [Glide64] clean up wx project files for visual studio 2013

---
 Project64.sln                               | Bin 30724 -> 31856 bytes
 Source/3rd Party/wx/wx_base.vcxproj         |   3 +++
 Source/3rd Party/wx/wx_base.vcxproj.filters |   6 +++++
 Source/3rd Party/wx/wx_core.vcxproj         |  12 ++++++++++
 Source/3rd Party/wx/wx_core.vcxproj.filters |  24 ++++++++++++++++++++
 Source/3rd Party/wx/wx_wxjpeg.vcxproj       |  10 +++++++-
 Source/3rd Party/wx/wx_wxpng.vcxproj        |  10 +++++++-
 Source/3rd Party/wx/wx_wxzlib.vcxproj       |  10 +++++++-
 8 files changed, 72 insertions(+), 3 deletions(-)

diff --git a/Project64.sln b/Project64.sln
index 7dfb6a7449628d833362131dc29012f6265d0bfe..0984cbcd6c268af37046666ae1459b886d982d31 100644
GIT binary patch
delta 368
zcmZqq!1&<@<AxK4lMiSJY`$Zt!7|ywDrS<o#AF8}i^)Fb5tA<%Ic)YZ_Yj<X!c%6m
zgJ%XKSmhqC9gLGNm<vqa;}tPkLCs>aj&H{14?Ymt$!C01CeP6@*_`7CRh8ohQFSLE
zWAlOlsH&Pkh$@*Ns4AHth^n5DjLiWdP*pmi5LIVFp{mY=LR8sAWNeCnD!LN^QB)HN
zRHTqBG`TJ^4D75o(HWaJL_<~e#6VQ(#ELL&z7XF6_R3^~<cQ4&68A7p-jE_Qc|)|_
z<atS6K=uQWKPTs;M@%j-bJ^^W*24@IsL4tJ294F`x~wj!KrYBogUM0KPMf3h<}pvM
i$?}?9R35Q;R*@6)WEpp_$xcNvo9~o*Fit*IZUq1hZI-<N

delta 436
zcmYL_ze@sP7{@tlJmLrmhYO^iOVFiqgNQ^!+GS{Ph~kf4E~zWxh=KxhaA*n%@w+rM
z2rUhV2=D4}V?%Q^NcaaxI5;#!^m^}6+ZR61_j%vvGx`#4M?&{y15Sj%2?gM+1W;QF
zLJa4igv8czgo@#@k8wY2wKCyP4RsbIA;MXYqLa{|?8qQW+{*)Zwx_wX^ihim*xV&B
z_hdRqnSx6jX-?15j7k}T<f=@&`yMUooW^uU2RiT8vmRZ`b1LQ;?dA#I3o^|V7*)(U
z{FIEzA8EhDXuVAEOk^4)Uia1DUE6qI-9vvXqChcH?g~<IS1=7nTtmOKfSKd$L<2}!
zW%+|K5%q&8%Nm-dj39}7nV&76@&~?8>?yR*3EI}b)1md}bZ9ZB(xQaz%Pri^OZ4sH
jehM~|*{T-N(=@7IkA3vBniSByna0r4(7DP%twnzUveU9&

diff --git a/Source/3rd Party/wx/wx_base.vcxproj b/Source/3rd Party/wx/wx_base.vcxproj
index ce3c88474..a2668b8cf 100644
--- a/Source/3rd Party/wx/wx_base.vcxproj	
+++ b/Source/3rd Party/wx/wx_base.vcxproj	
@@ -42,6 +42,7 @@
       <PreprocessorDefinitions>_LIB;__WXMSW__;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
       <DisableSpecificWarnings>4005;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <WarningLevel>Level3</WarningLevel>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -53,6 +54,7 @@
     <ClCompile Include="src\common\cmdline.cpp" />
     <ClCompile Include="src\common\config.cpp" />
     <ClCompile Include="src\common\convauto.cpp" />
+    <ClCompile Include="src\common\datacmn.cpp" />
     <ClCompile Include="src\common\datetime.cpp" />
     <ClCompile Include="src\common\datstrm.cpp" />
     <ClCompile Include="src\common\dircmn.cpp" />
@@ -115,6 +117,7 @@
     <ClCompile Include="src\common\utilscmn.cpp" />
     <ClCompile Include="src\common\variant.cpp" />
     <ClCompile Include="src\common\wfstream.cpp" />
+    <ClCompile Include="src\common\wxchar.cpp" />
     <ClCompile Include="src\common\xti.cpp" />
     <ClCompile Include="src\common\xtistrm.cpp" />
     <ClCompile Include="src\common\zipstrm.cpp" />
diff --git a/Source/3rd Party/wx/wx_base.vcxproj.filters b/Source/3rd Party/wx/wx_base.vcxproj.filters
index 9ffd46ae0..efdb44d8b 100644
--- a/Source/3rd Party/wx/wx_base.vcxproj.filters	
+++ b/Source/3rd Party/wx/wx_base.vcxproj.filters	
@@ -288,6 +288,12 @@
     <ClCompile Include="src\msw\volume.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>
+    <ClCompile Include="src\common\datacmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\wxchar.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="src\msw\version.rc">
diff --git a/Source/3rd Party/wx/wx_core.vcxproj b/Source/3rd Party/wx/wx_core.vcxproj
index 813d250ab..22e255a88 100644
--- a/Source/3rd Party/wx/wx_core.vcxproj	
+++ b/Source/3rd Party/wx/wx_core.vcxproj	
@@ -44,7 +44,11 @@
       <DisableSpecificWarnings>4005;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <UndefinePreprocessorDefinitions>
       </UndefinePreprocessorDefinitions>
+      <WarningLevel>Level3</WarningLevel>
     </ClCompile>
+    <Lib>
+      <AdditionalDependencies>Comctl32.lib;Rpcrt4.lib</AdditionalDependencies>
+    </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="src\common\accesscmn.cpp" />
@@ -80,6 +84,7 @@
     </ClCompile>
     <ClCompile Include="src\common\effects.cpp" />
     <ClCompile Include="src\common\event.cpp" />
+    <ClCompile Include="src\common\evtloopcmn.cpp" />
     <ClCompile Include="src\common\fddlgcmn.cpp" />
     <ClCompile Include="src\common\filepickercmn.cpp" />
     <ClCompile Include="src\common\fldlgcmn.cpp" />
@@ -133,6 +138,7 @@
     <ClCompile Include="src\common\stockitem.cpp" />
     <ClCompile Include="src\common\tbarbase.cpp" />
     <ClCompile Include="src\common\textcmn.cpp" />
+    <ClCompile Include="src\common\timercmn.cpp" />
     <ClCompile Include="src\common\toplvcmn.cpp" />
     <ClCompile Include="src\common\treebase.cpp" />
     <ClCompile Include="src\common\utilscmn.cpp" />
@@ -141,7 +147,9 @@
     <ClCompile Include="src\common\valtext.cpp" />
     <ClCompile Include="src\common\wincmn.cpp" />
     <ClCompile Include="src\common\xpmdecod.cpp" />
+    <ClCompile Include="src\generic\panelg.cpp" />
     <ClCompile Include="src\msw\accel.cpp" />
+    <ClCompile Include="src\msw\gsockmsw.cpp" />
     <ClCompile Include="src\msw\ole\access.cpp" />
     <ClCompile Include="src\msw\ole\activex.cpp">
       <PrecompiledHeader>
@@ -242,14 +250,18 @@
     <ClCompile Include="src\msw\renderer.cpp" />
     <ClCompile Include="src\msw\scrolbar.cpp" />
     <ClCompile Include="src\msw\settings.cpp" />
+    <ClCompile Include="src\msw\slider95.cpp" />
     <ClCompile Include="src\msw\spinbutt.cpp" />
     <ClCompile Include="src\msw\spinctrl.cpp" />
     <ClCompile Include="src\msw\statbmp.cpp" />
     <ClCompile Include="src\msw\statbox.cpp" />
+    <ClCompile Include="src\msw\statbr95.cpp" />
     <ClCompile Include="src\msw\statline.cpp" />
     <ClCompile Include="src\msw\stattext.cpp" />
+    <ClCompile Include="src\msw\tbar95.cpp" />
     <ClCompile Include="src\msw\textctrl.cpp" />
     <ClCompile Include="src\msw\tglbtn.cpp" />
+    <ClCompile Include="src\msw\timer.cpp" />
     <ClCompile Include="src\msw\tooltip.cpp" />
     <ClCompile Include="src\msw\toplevel.cpp" />
     <ClCompile Include="src\msw\treectrl.cpp" />
diff --git a/Source/3rd Party/wx/wx_core.vcxproj.filters b/Source/3rd Party/wx/wx_core.vcxproj.filters
index 9f3d8dda4..475735b49 100644
--- a/Source/3rd Party/wx/wx_core.vcxproj.filters	
+++ b/Source/3rd Party/wx/wx_core.vcxproj.filters	
@@ -678,6 +678,30 @@
     <ClCompile Include="src\generic\vscroll.cpp">
       <Filter>Generic Sources</Filter>
     </ClCompile>
+    <ClCompile Include="src\generic\panelg.cpp">
+      <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\statbr95.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\slider95.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\tbar95.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\gsockmsw.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\evtloopcmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\timercmn.cpp">
+      <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\timer.cpp">
+      <Filter>MSW Sources</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\wx\msw\accel.h">
diff --git a/Source/3rd Party/wx/wx_wxjpeg.vcxproj b/Source/3rd Party/wx/wx_wxjpeg.vcxproj
index c488db3a3..998623bc3 100644
--- a/Source/3rd Party/wx/wx_wxjpeg.vcxproj	
+++ b/Source/3rd Party/wx/wx_wxjpeg.vcxproj	
@@ -5,10 +5,18 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectName>wxjpeg</ProjectName>
@@ -26,7 +34,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <PropertyGroup>
     <TargetName>wxjpeg</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">wxjpegd</TargetName>
+    <TargetName Condition="'$(Configuration)'=='Debug'">wxjpegd</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
diff --git a/Source/3rd Party/wx/wx_wxpng.vcxproj b/Source/3rd Party/wx/wx_wxpng.vcxproj
index ca0c0d0a2..dd9f2f4f6 100644
--- a/Source/3rd Party/wx/wx_wxpng.vcxproj	
+++ b/Source/3rd Party/wx/wx_wxpng.vcxproj	
@@ -5,10 +5,18 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectName>wxpng</ProjectName>
@@ -26,7 +34,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <PropertyGroup>
     <TargetName>wxpng</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">wxpngd</TargetName>
+    <TargetName Condition="'$(Configuration)'=='Debug'">wxpngd</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
diff --git a/Source/3rd Party/wx/wx_wxzlib.vcxproj b/Source/3rd Party/wx/wx_wxzlib.vcxproj
index db40fd576..937374cbb 100644
--- a/Source/3rd Party/wx/wx_wxzlib.vcxproj	
+++ b/Source/3rd Party/wx/wx_wxzlib.vcxproj	
@@ -5,10 +5,18 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectName>wxzlib</ProjectName>
@@ -26,7 +34,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <PropertyGroup>
     <TargetName>wxzlib</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">wxzlibd</TargetName>
+    <TargetName Condition="'$(Configuration)'=='Debug'">wxzlibd</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>