From 307d1de0c522d879c3aad5d8bc869d731dbf7efc Mon Sep 17 00:00:00 2001
From: zilmar <zilmar@pj64-emu.com>
Date: Tue, 20 Oct 2015 05:58:32 +1100
Subject: [PATCH] [Glide64] cleaned up wx project files to compile, still need
 to fix up some linking

---
 PropertySheets/Default.vsprops              |  2 +-
 PropertySheets/Platform.props               |  2 +-
 Source/3rd Party/wx/wx_base.vcxproj         | 33 +--------
 Source/3rd Party/wx/wx_base.vcxproj.filters | 75 ---------------------
 Source/3rd Party/wx/wx_core.vcxproj         |  8 +--
 Source/3rd Party/wx/wx_wxjpeg.vcxproj       |  4 --
 Source/3rd Party/wx/wx_wxpng.vcxproj        |  4 --
 Source/3rd Party/wx/wx_wxzlib.vcxproj       |  4 --
 Source/GlideHQ/GlideHQ.vcxproj              |  2 +-
 9 files changed, 7 insertions(+), 127 deletions(-)

diff --git a/PropertySheets/Default.vsprops b/PropertySheets/Default.vsprops
index 23f4146aa..29f44018a 100644
--- a/PropertySheets/Default.vsprops
+++ b/PropertySheets/Default.vsprops
@@ -69,7 +69,7 @@
 	/>
 	<Tool
 		Name="VCLibrarianTool"
-		OutputFile="$(OutDir)\lib\$(ProjectName).lib"
+		OutputFile="$(OutDir)\$(TargetName).lib"
 		UseUnicodeResponseFiles="true"
 		LinkLibraryDependencies="true"
 		AdditionalLibraryDirectories=""
diff --git a/PropertySheets/Platform.props b/PropertySheets/Platform.props
index a5ae131a8..d7b451c62 100644
--- a/PropertySheets/Platform.props
+++ b/PropertySheets/Platform.props
@@ -99,7 +99,7 @@
       <ErrorReporting>Prompt</ErrorReporting>
     </ClCompile>
     <Lib>
-      <OutputFile>$(OutDir)$(ProjectName).lib</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName).lib</OutputFile>
       <UseUnicodeResponseFiles>true</UseUnicodeResponseFiles>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
diff --git a/Source/3rd Party/wx/wx_base.vcxproj b/Source/3rd Party/wx/wx_base.vcxproj
index 7d8ae51b3..ce3c88474 100644
--- a/Source/3rd Party/wx/wx_base.vcxproj	
+++ b/Source/3rd Party/wx/wx_base.vcxproj	
@@ -33,8 +33,8 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <PropertyGroup>
-    <TargetName>wxbase29</TargetName>
-    <TargetName Condition="'$(Configuration)'=='Debug'">wxbase29d</TargetName>
+    <TargetName>wxbase28</TargetName>
+    <TargetName Condition="'$(Configuration)'=='Debug'">wxbase28d</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
@@ -43,25 +43,17 @@
       <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
       <DisableSpecificWarnings>4005;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)wxbase29.lib</OutputFile>
-      <OutputFile Condition="'$(Configuration)'=='Debug'">$(OutDir)wxbase29d.lib</OutputFile>
-    </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="src\common\any.cpp" />
     <ClCompile Include="src\common\appbase.cpp" />
     <ClCompile Include="src\common\arcall.cpp" />
     <ClCompile Include="src\common\arcfind.cpp" />
     <ClCompile Include="src\common\archive.cpp" />
-    <ClCompile Include="src\common\arrstr.cpp" />
-    <ClCompile Include="src\common\base64.cpp" />
     <ClCompile Include="src\common\clntdata.cpp" />
     <ClCompile Include="src\common\cmdline.cpp" />
     <ClCompile Include="src\common\config.cpp" />
     <ClCompile Include="src\common\convauto.cpp" />
     <ClCompile Include="src\common\datetime.cpp" />
-    <ClCompile Include="src\common\datetimefmt.cpp" />
     <ClCompile Include="src\common\datstrm.cpp" />
     <ClCompile Include="src\common\dircmn.cpp" />
     <ClCompile Include="src\common\dummy.cpp">
@@ -72,7 +64,6 @@
     <ClCompile Include="src\common\dynload.cpp" />
     <ClCompile Include="src\common\encconv.cpp" />
     <ClCompile Include="src\common\event.cpp" />
-    <ClCompile Include="src\common\evtloopcmn.cpp" />
     <ClCompile Include="src\common\extended.c">
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -90,13 +81,11 @@
     <ClCompile Include="src\common\fs_arc.cpp" />
     <ClCompile Include="src\common\fs_filter.cpp" />
     <ClCompile Include="src\common\fs_mem.cpp" />
-    <ClCompile Include="src\common\fswatchercmn.cpp" />
     <ClCompile Include="src\common\hash.cpp" />
     <ClCompile Include="src\common\hashmap.cpp" />
     <ClCompile Include="src\common\init.cpp" />
     <ClCompile Include="src\common\intl.cpp" />
     <ClCompile Include="src\common\ipcbase.cpp" />
-    <ClCompile Include="src\common\languageinfo.cpp" />
     <ClCompile Include="src\common\list.cpp" />
     <ClCompile Include="src\common\log.cpp" />
     <ClCompile Include="src\common\longlong.cpp" />
@@ -105,7 +94,6 @@
     <ClCompile Include="src\common\module.cpp" />
     <ClCompile Include="src\common\msgout.cpp" />
     <ClCompile Include="src\common\mstream.cpp" />
-    <ClCompile Include="src\common\numformatter.cpp" />
     <ClCompile Include="src\common\object.cpp" />
     <ClCompile Include="src\common\platinfo.cpp" />
     <ClCompile Include="src\common\powercmn.cpp" />
@@ -113,33 +101,20 @@
     <ClCompile Include="src\common\regex.cpp" />
     <ClCompile Include="src\common\sstream.cpp" />
     <ClCompile Include="src\common\stdpbase.cpp" />
-    <ClCompile Include="src\common\stdstream.cpp" />
     <ClCompile Include="src\common\stopwatch.cpp" />
     <ClCompile Include="src\common\strconv.cpp" />
     <ClCompile Include="src\common\stream.cpp" />
     <ClCompile Include="src\common\string.cpp" />
-    <ClCompile Include="src\common\stringimpl.cpp" />
-    <ClCompile Include="src\common\stringops.cpp" />
-    <ClCompile Include="src\common\strvararg.cpp" />
     <ClCompile Include="src\common\sysopt.cpp" />
     <ClCompile Include="src\common\tarstrm.cpp" />
     <ClCompile Include="src\common\textbuf.cpp" />
     <ClCompile Include="src\common\textfile.cpp" />
-    <ClCompile Include="src\common\time.cpp" />
-    <ClCompile Include="src\common\timercmn.cpp" />
-    <ClCompile Include="src\common\timerimpl.cpp" />
     <ClCompile Include="src\common\tokenzr.cpp" />
-    <ClCompile Include="src\common\translation.cpp" />
     <ClCompile Include="src\common\txtstrm.cpp" />
-    <ClCompile Include="src\common\unichar.cpp" />
     <ClCompile Include="src\common\uri.cpp" />
-    <ClCompile Include="src\common\ustring.cpp" />
     <ClCompile Include="src\common\utilscmn.cpp" />
     <ClCompile Include="src\common\variant.cpp" />
     <ClCompile Include="src\common\wfstream.cpp" />
-    <ClCompile Include="src\common\wxcrt.cpp" />
-    <ClCompile Include="src\common\wxprintf.cpp" />
-    <ClCompile Include="src\common\xlocale.cpp" />
     <ClCompile Include="src\common\xti.cpp" />
     <ClCompile Include="src\common\xtistrm.cpp" />
     <ClCompile Include="src\common\zipstrm.cpp" />
@@ -150,8 +125,6 @@
     <ClCompile Include="src\msw\debughlp.cpp" />
     <ClCompile Include="src\msw\dir.cpp" />
     <ClCompile Include="src\msw\dlmsw.cpp" />
-    <ClCompile Include="src\msw\evtloop.cpp" />
-    <ClCompile Include="src\msw\fswatcher.cpp" />
     <ClCompile Include="src\msw\main.cpp" />
     <ClCompile Include="src\msw\mimetype.cpp" />
     <ClCompile Include="src\msw\mslu.cpp" />
@@ -162,14 +135,12 @@
     <ClCompile Include="src\msw\stackwalk.cpp" />
     <ClCompile Include="src\msw\stdpaths.cpp" />
     <ClCompile Include="src\msw\thread.cpp" />
-    <ClCompile Include="src\msw\timer.cpp" />
     <ClCompile Include="src\msw\utils.cpp">
       <PrecompiledHeader>
       </PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="src\msw\utilsexc.cpp" />
     <ClCompile Include="src\msw\volume.cpp" />
-    <ClCompile Include="src\generic\fswatcherg.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="src\msw\version.rc">
diff --git a/Source/3rd Party/wx/wx_base.vcxproj.filters b/Source/3rd Party/wx/wx_base.vcxproj.filters
index 0652ad22f..9ffd46ae0 100644
--- a/Source/3rd Party/wx/wx_base.vcxproj.filters	
+++ b/Source/3rd Party/wx/wx_base.vcxproj.filters	
@@ -24,9 +24,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="src\common\any.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\appbase.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
@@ -39,12 +36,6 @@
     <ClCompile Include="src\common\archive.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\arrstr.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\common\base64.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\clntdata.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
@@ -60,9 +51,6 @@
     <ClCompile Include="src\common\datetime.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\datetimefmt.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\datstrm.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
@@ -87,9 +75,6 @@
     <ClCompile Include="src\common\event.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\evtloopcmn.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\extended.c">
       <Filter>Common Sources</Filter>
     </ClCompile>
@@ -132,9 +117,6 @@
     <ClCompile Include="src\common\fs_mem.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\fswatchercmn.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\hash.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
@@ -150,9 +132,6 @@
     <ClCompile Include="src\common\ipcbase.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\languageinfo.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\list.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
@@ -177,9 +156,6 @@
     <ClCompile Include="src\common\mstream.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\numformatter.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\object.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
@@ -201,9 +177,6 @@
     <ClCompile Include="src\common\stdpbase.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\stdstream.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\stopwatch.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
@@ -216,15 +189,6 @@
     <ClCompile Include="src\common\string.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\stringimpl.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\common\stringops.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\common\strvararg.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\sysopt.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
@@ -237,33 +201,15 @@
     <ClCompile Include="src\common\textfile.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\time.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\common\timercmn.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\common\timerimpl.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\tokenzr.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\translation.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\txtstrm.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\unichar.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\uri.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\ustring.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\utilscmn.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
@@ -273,15 +219,6 @@
     <ClCompile Include="src\common\wfstream.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\wxcrt.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\common\wxprintf.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\common\xlocale.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\common\xti.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
@@ -312,12 +249,6 @@
     <ClCompile Include="src\msw\dlmsw.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\msw\evtloop.cpp">
-      <Filter>MSW Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\msw\fswatcher.cpp">
-      <Filter>MSW Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\msw\main.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>
@@ -348,9 +279,6 @@
     <ClCompile Include="src\msw\thread.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\msw\timer.cpp">
-      <Filter>MSW Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\msw\utils.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>
@@ -360,9 +288,6 @@
     <ClCompile Include="src\msw\volume.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\generic\fswatcherg.cpp">
-      <Filter>Generic 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 eddde086a..813d250ab 100644
--- a/Source/3rd Party/wx/wx_core.vcxproj	
+++ b/Source/3rd Party/wx/wx_core.vcxproj	
@@ -33,8 +33,8 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <PropertyGroup>
-    <TargetName>wxmsw29_core</TargetName>
-    <TargetName Condition="'$(Configuration)'=='Debug'">wxmsw29d_core</TargetName>
+    <TargetName>wxmsw28_core</TargetName>
+    <TargetName Condition="'$(Configuration)'=='Debug'">wxmsw28d_core</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
@@ -45,10 +45,6 @@
       <UndefinePreprocessorDefinitions>
       </UndefinePreprocessorDefinitions>
     </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)wxmsw29_core.lib</OutputFile>
-      <OutputFile Condition="'$(Configuration)'=='Debug'">$(OutDir)wxmsw29d_core.lib</OutputFile>
-    </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="src\common\accesscmn.cpp" />
diff --git a/Source/3rd Party/wx/wx_wxjpeg.vcxproj b/Source/3rd Party/wx/wx_wxjpeg.vcxproj
index 365e7cf4c..c488db3a3 100644
--- a/Source/3rd Party/wx/wx_wxjpeg.vcxproj	
+++ b/Source/3rd Party/wx/wx_wxjpeg.vcxproj	
@@ -35,10 +35,6 @@
       <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
     </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)wxjpeg.lib</OutputFile>
-      <OutputFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)wxjpegd.lib</OutputFile>
-    </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="src\jpeg\jcapimin.c" />
diff --git a/Source/3rd Party/wx/wx_wxpng.vcxproj b/Source/3rd Party/wx/wx_wxpng.vcxproj
index 39f996dec..ca0c0d0a2 100644
--- a/Source/3rd Party/wx/wx_wxpng.vcxproj	
+++ b/Source/3rd Party/wx/wx_wxpng.vcxproj	
@@ -35,10 +35,6 @@
       <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
     </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)wxpng.lib</OutputFile>
-      <OutputFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)wxpngd.lib</OutputFile>
-    </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="src\png\png.c" />
diff --git a/Source/3rd Party/wx/wx_wxzlib.vcxproj b/Source/3rd Party/wx/wx_wxzlib.vcxproj
index 6572845d7..db40fd576 100644
--- a/Source/3rd Party/wx/wx_wxzlib.vcxproj	
+++ b/Source/3rd Party/wx/wx_wxzlib.vcxproj	
@@ -34,10 +34,6 @@
       <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
     </ClCompile>
-    <Lib>
-      <OutputFile>$(OutDir)wxzlib.lib</OutputFile>
-      <OutputFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)wxzlibd.lib</OutputFile>
-    </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="src\zlib\adler32.c" />
diff --git a/Source/GlideHQ/GlideHQ.vcxproj b/Source/GlideHQ/GlideHQ.vcxproj
index 31620abf6..822afbd13 100644
--- a/Source/GlideHQ/GlideHQ.vcxproj
+++ b/Source/GlideHQ/GlideHQ.vcxproj
@@ -33,7 +33,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(Root)Source/3rd Party/wx/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(Root)Source/3rd Party/wx/include/msvc;$(Root)Source/3rd Party/wx/include;$(Root)Source/3rd Party/wx/src/zlib;$(Root)Source/3rd Party/wx/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
     </ClCompile>