From ff962750fb99bc8e380ff101da1cd0fc2f2f177e Mon Sep 17 00:00:00 2001
From: John Peterson <jpeterson57@gmail.com>
Date: Sat, 29 Aug 2009 08:45:06 +0000
Subject: [PATCH] VS solution: Some fixes

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4094 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/DolphinWX/DolphinWX.vcproj | 16 ++++++++--------
 Source/Dolphin.sln                     | 12 ++----------
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/Source/Core/DolphinWX/DolphinWX.vcproj b/Source/Core/DolphinWX/DolphinWX.vcproj
index 486746f593..1414e80ef2 100644
--- a/Source/Core/DolphinWX/DolphinWX.vcproj
+++ b/Source/Core/DolphinWX/DolphinWX.vcproj
@@ -211,7 +211,7 @@
 				OutputFile="../../../Binary/x64/Dolphin.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\Externals\wxWidgets\lib\vc_lib\x64"
+				AdditionalLibraryDirectories="$(SolutionDir)\$(ConfigurationName)\$(PlatformName);..\..\..\Externals\wxWidgets\lib\vc_lib\$(PlatformName)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\$(TargetName).pdb"
 				SubSystem="2"
@@ -318,11 +318,11 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/TLBID:1"
-				AdditionalDependencies="comctl32.lib rpcrt4.lib winmm.lib wxbase28ud.lib wxmsw28ud_core.lib wxmsw28ud_adv.lib wxmsw28ud_aui.lib"
+				AdditionalDependencies="comctl32.lib rpcrt4.lib winmm.lib wxbase28ud.lib wxmsw28ud_core.lib wxmsw28ud_adv.lib wxmsw28ud_aui.lib Bochs_disasm.lib LZO.lib SFML_Network.lib zlib.lib"
 				OutputFile="../../../Binary/Win32/DolphinD.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\Externals\wxWidgets\lib\vc_lib\Win32;..\..\..\Externals\LZO\win32\$(ConfigurationName)"
+				AdditionalLibraryDirectories="$(SolutionDir)\$(ConfigurationName)\$(PlatformName);..\..\..\Externals\wxWidgets\lib\vc_lib\$(PlatformName)"
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\$(TargetName).pdb"
@@ -433,7 +433,7 @@
 				OutputFile="../../../Binary/x64/DolphinD.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\Externals\wxWidgets\lib\vc_lib\x64"
+				AdditionalLibraryDirectories="$(SolutionDir)\$(ConfigurationName)\$(PlatformName);..\..\..\Externals\wxWidgets\lib\vc_lib\$(PlatformName)"
 				IgnoreDefaultLibraryNames=""
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\$(TargetName).pdb"
@@ -547,7 +547,7 @@
 				OutputFile="../../../Binary/Win32/DolphinDF.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\Externals\wxWidgets\lib\vc_lib\Win32;..\..\..\Externals\LZO\win32\$(ConfigurationName)"
+				AdditionalLibraryDirectories="$(SolutionDir)\$(ConfigurationName)\$(PlatformName);..\..\..\Externals\wxWidgets\lib\vc_lib\$(PlatformName)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\$(TargetName).pdb"
 				SubSystem="2"
@@ -659,7 +659,7 @@
 				OutputFile="../../../Binary/x64/DolphinDF.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\Externals\wxWidgets\lib\vc_lib\x64"
+				AdditionalLibraryDirectories="$(SolutionDir)\$(ConfigurationName)\$(PlatformName);..\..\..\Externals\wxWidgets\lib\vc_lib\$(PlatformName)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\$(TargetName).pdb"
 				GenerateMapFile="false"
@@ -772,7 +772,7 @@
 				OutputFile="../../../Binary/Win32/DolphinIL.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\Externals\wxWidgets\lib\vc_lib\Win32;..\..\..\Externals\LZO\win32\$(ConfigurationName)"
+				AdditionalLibraryDirectories="$(SolutionDir)\$(ConfigurationName)\$(PlatformName);..\..\..\Externals\wxWidgets\lib\vc_lib\$(PlatformName)"
 				IgnoreAllDefaultLibraries="false"
 				IgnoreDefaultLibraryNames="msvcrt"
 				GenerateDebugInformation="true"
@@ -888,7 +888,7 @@
 				OutputFile="../../../Binary/x64/DolphinIL.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\..\..\Externals\wxWidgets\lib\vc_lib\x64"
+				AdditionalLibraryDirectories="$(SolutionDir)\$(ConfigurationName)\$(PlatformName);..\..\..\Externals\wxWidgets\lib\vc_lib\$(PlatformName)"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\$(TargetName).pdb"
 				SubSystem="2"
diff --git a/Source/Dolphin.sln b/Source/Dolphin.sln
index 86234c5cce..df8005cee0 100644
--- a/Source/Dolphin.sln
+++ b/Source/Dolphin.sln
@@ -36,13 +36,6 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dolphin", "Core\DolphinWX\DolphinWX.vcproj", "{A72606EF-C5C1-4954-90AD-F0F93A8D97D9}"
 	ProjectSection(ProjectDependencies) = postProject
 		{C7E5D50A-2916-464B-86A7-E10B3CC88ADA} = {C7E5D50A-2916-464B-86A7-E10B3CC88ADA}
-		{CFDCEE0E-FA45-4F72-9FCC-0B88F5A75160} = {CFDCEE0E-FA45-4F72-9FCC-0B88F5A75160}
-		{D6E56527-BBB9-4EAD-A6EC-49D4BF6AFCD8} = {D6E56527-BBB9-4EAD-A6EC-49D4BF6AFCD8}
-		{8D612734-FAA5-4B8A-804F-4DEA2367D495} = {8D612734-FAA5-4B8A-804F-4DEA2367D495}
-		{9A183B48-ECC2-4121-876A-9B3793686073} = {9A183B48-ECC2-4121-876A-9B3793686073}
-		{636FAD5F-02D1-4E9A-BE67-FB8EA99B9A18} = {636FAD5F-02D1-4E9A-BE67-FB8EA99B9A18}
-		{3D8156A9-64D1-4C8E-ADBE-1B319030E4A4} = {3D8156A9-64D1-4C8E-ADBE-1B319030E4A4}
-		{521498BE-6089-4780-8223-E67C22F4E068} = {521498BE-6089-4780-8223-E67C22F4E068}
 		{E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA} = {E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA}
 		{4D3CD4C5-412B-4B49-9B1B-A68A2A129C77} = {4D3CD4C5-412B-4B49-9B1B-A68A2A129C77}
 		{F0B874CB-4476-4199-9315-8343D05AE684} = {F0B874CB-4476-4199-9315-8343D05AE684}
@@ -283,7 +276,6 @@ Global
 		{521498BE-6089-4780-8223-E67C22F4E068}.Release|x64.ActiveCfg = Release|x64
 		{521498BE-6089-4780-8223-E67C22F4E068}.Release|x64.Build.0 = Release|x64
 		{D6E56527-BBB9-4EAD-A6EC-49D4BF6AFCD8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D6E56527-BBB9-4EAD-A6EC-49D4BF6AFCD8}.Debug|Win32.Build.0 = Debug|Win32
 		{D6E56527-BBB9-4EAD-A6EC-49D4BF6AFCD8}.Debug|x64.ActiveCfg = Debug|x64
 		{D6E56527-BBB9-4EAD-A6EC-49D4BF6AFCD8}.Debug|x64.Build.0 = Debug|x64
 		{D6E56527-BBB9-4EAD-A6EC-49D4BF6AFCD8}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
@@ -407,11 +399,11 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{B7F1A9FB-BEA8-416E-9460-AE35A6A5165C} = {C6DF3D54-9D2F-46B7-8E24-C9C64939D8CD}
 		{C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C6DF3D54-9D2F-46B7-8E24-C9C64939D8CD}
-		{F0B874CB-4476-4199-9315-8343D05AE684} = {C6DF3D54-9D2F-46B7-8E24-C9C64939D8CD}
 		{E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA} = {C6DF3D54-9D2F-46B7-8E24-C9C64939D8CD}
-		{FBAFB369-07EB-4460-9CAD-08BE5789DAB6} = {C6DF3D54-9D2F-46B7-8E24-C9C64939D8CD}
 		{C7E5D50A-2916-464B-86A7-E10B3CC88ADA} = {C6DF3D54-9D2F-46B7-8E24-C9C64939D8CD}
+		{FBAFB369-07EB-4460-9CAD-08BE5789DAB6} = {C6DF3D54-9D2F-46B7-8E24-C9C64939D8CD}
 		{838A89A3-3AA0-4A45-ACBE-3D1E0980C2ED} = {C6DF3D54-9D2F-46B7-8E24-C9C64939D8CD}
+		{F0B874CB-4476-4199-9315-8343D05AE684} = {C6DF3D54-9D2F-46B7-8E24-C9C64939D8CD}
 		{9A183B48-ECC2-4121-876A-9B3793686073} = {485472A2-374D-4288-92EF-C7A006674F67}
 		{CFDCEE0E-FA45-4F72-9FCC-0B88F5A75160} = {485472A2-374D-4288-92EF-C7A006674F67}
 		{521498BE-6089-4780-8223-E67C22F4E068} = {485472A2-374D-4288-92EF-C7A006674F67}