From c3d13b048c40b9df99d401939bd747e1de5c878e Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Sun, 18 Mar 2012 02:31:19 -0700
Subject: build against wxWidgets3 from Externals on Windows.

use Externals version of libpng on Windows.
---
 Source/VSProps/WXWOverrides.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Source/VSProps')

diff --git a/Source/VSProps/WXWOverrides.props b/Source/VSProps/WXWOverrides.props
index 512c9a83e3..cf6d5d6065 100644
--- a/Source/VSProps/WXWOverrides.props
+++ b/Source/VSProps/WXWOverrides.props
@@ -13,7 +13,7 @@
       <ExceptionHandling>Async</ExceptionHandling>
       <DisableSpecificWarnings>4267</DisableSpecificWarnings>
       <PreprocessorDefinitions>_LIB;__WXMSW__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\include;..\..\include\msvc;..\..\..\zlib;..\..\src\png;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\;..\..\include;..\..\..\zlib;..\..\..\libpng</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup />
-- 
cgit v1.2.3


From d9a7510937cf4bc6020656ddd38880d436a65549 Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Sun, 18 Mar 2012 03:30:03 -0700
Subject: forgot to add wxwidgets3 vcxproj to git, since it was masked by
 gitignore...

fix up misc warnings and build errors
---
 Source/VSProps/WXWOverrides.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Source/VSProps')

diff --git a/Source/VSProps/WXWOverrides.props b/Source/VSProps/WXWOverrides.props
index cf6d5d6065..d979a83c43 100644
--- a/Source/VSProps/WXWOverrides.props
+++ b/Source/VSProps/WXWOverrides.props
@@ -12,7 +12,7 @@
       <PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
       <ExceptionHandling>Async</ExceptionHandling>
       <DisableSpecificWarnings>4267</DisableSpecificWarnings>
-      <PreprocessorDefinitions>_LIB;__WXMSW__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_LIB;__WXMSW__;WXBUILDING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\;..\..\include;..\..\..\zlib;..\..\..\libpng</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
-- 
cgit v1.2.3


From 2ab2afaa1f77d03c5396338127d7e2463dafc680 Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Sun, 18 Mar 2012 07:50:37 -0700
Subject: update portaudio to stable_v19_20111121 and fix linker warnings

---
 Source/VSProps/Dolphin.Win32.props | 2 +-
 Source/VSProps/Dolphin.x64.props   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'Source/VSProps')

diff --git a/Source/VSProps/Dolphin.Win32.props b/Source/VSProps/Dolphin.Win32.props
index 8908f84c94..5adc4159e0 100644
--- a/Source/VSProps/Dolphin.Win32.props
+++ b/Source/VSProps/Dolphin.Win32.props
@@ -7,7 +7,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <Link>
-      <AdditionalLibraryDirectories>..\..\..\Externals\SDL\$(PlatformName);..\..\..\Externals\GLew;..\..\..\Externals\Cg;..\..\..\Externals\portaudio\$(PlatformName)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\Externals\SDL\$(PlatformName);..\..\..\Externals\GLew;..\..\..\Externals\Cg;..\..\..\Externals\portaudio\$(PlatformName)\$(ConfigurationName)</AdditionalLibraryDirectories>
       <AdditionalDependencies>portaudio.lib;dsound.lib;dxerr.lib;iphlpapi.lib;winmm.lib;setupapi.lib;xinput.lib;vfw32.lib;cg.lib;cgGL.lib;opengl32.lib;glew32s.lib;glu32.lib;rpcrt4.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
diff --git a/Source/VSProps/Dolphin.x64.props b/Source/VSProps/Dolphin.x64.props
index b729ff4414..557e6350e7 100644
--- a/Source/VSProps/Dolphin.x64.props
+++ b/Source/VSProps/Dolphin.x64.props
@@ -8,7 +8,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <Link>
-      <AdditionalLibraryDirectories>..\..\..\Externals\SDL\$(PlatformName);..\..\..\Externals\GLew;..\..\..\Externals\Cg64;..\..\..\Externals\portaudio\$(PlatformName)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\Externals\SDL\$(PlatformName);..\..\..\Externals\GLew;..\..\..\Externals\Cg64;..\..\..\Externals\portaudio\$(PlatformName)\$(ConfigurationName)</AdditionalLibraryDirectories>
       <AdditionalDependencies>portaudio.lib;dsound.lib;dxerr.lib;iphlpapi.lib;winmm.lib;setupapi.lib;xinput.lib;vfw32.lib;cg.lib;cgGL.lib;opengl32.lib;glew64s.lib;glu32.lib;rpcrt4.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
-- 
cgit v1.2.3


From 70b6c4280f72a1adaa7cefc7ab7cc7173e3c8e7f Mon Sep 17 00:00:00 2001
From: Pierre Bourdon <delroth@gmail.com>
Date: Wed, 21 Mar 2012 22:43:44 +0100
Subject: Compile with /fp:precise instead of /fp:fast in release mode on
 Windows

/fp:fast was introducing FP precision problems, and mixing it with some
/fp:precise code caused strange game behaviors, DSI exceptions and freezes.

This commit should fix most of the issues introduced by 3.0-73 (r95517a97).

Thanks to hatarumoroboshi@hotmail.com for tracking a lot of these Win32 bugs.

Fixes issue 4906.
Fixes issue 5138.
Probably fixes (not tested) issue 5067.
---
 Source/VSProps/CodeGen_Release.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Source/VSProps')

diff --git a/Source/VSProps/CodeGen_Release.props b/Source/VSProps/CodeGen_Release.props
index 74770b6910..2dd392b7a9 100644
--- a/Source/VSProps/CodeGen_Release.props
+++ b/Source/VSProps/CodeGen_Release.props
@@ -19,7 +19,7 @@
       <FunctionLevelLinking>false</FunctionLevelLinking>
       <PreprocessorDefinitions>_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <FloatingPointModel>Fast</FloatingPointModel>
+      <FloatingPointModel>Precise</FloatingPointModel>
     </ClCompile>
     <Link>
       <OptimizeReferences>true</OptimizeReferences>
-- 
cgit v1.2.3


From 15db05d7abd781d2a4ddcbeca57ff30a87b663f9 Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Wed, 21 Mar 2012 14:53:50 -0700
Subject: I am very picky about my VS files... :D

---
 Source/VSProps/CodeGen_Release.props | 1 -
 1 file changed, 1 deletion(-)

(limited to 'Source/VSProps')

diff --git a/Source/VSProps/CodeGen_Release.props b/Source/VSProps/CodeGen_Release.props
index 2dd392b7a9..2b69dc0f63 100644
--- a/Source/VSProps/CodeGen_Release.props
+++ b/Source/VSProps/CodeGen_Release.props
@@ -19,7 +19,6 @@
       <FunctionLevelLinking>false</FunctionLevelLinking>
       <PreprocessorDefinitions>_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-      <FloatingPointModel>Precise</FloatingPointModel>
     </ClCompile>
     <Link>
       <OptimizeReferences>true</OptimizeReferences>
-- 
cgit v1.2.3