DiscIO.vcproj depends on zlib...

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4590 8ced0084-cf51-0410-be5f-012b33b47a6e

Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp

@@ -939,9 +939,8 @@ namespace Core
 		DEBUG_LOG(WII_IPC_WIIMOTE, "=========================================================");
 		const u8* pData = (const u8*)_pData;
 		DEBUG_LOG(WII_IPC_WIIMOTE, "Callback_WiimoteInput:");
-		//std::string Temp = ArrayToString(pData, _Size, 0, 50);
+		DEBUG_LOG(WII_IPC_WIIMOTE, "   Data: %s", ArrayToString(pData, _Size, 0, 50).c_str());
-		//LOGV(WII_IPC_WIIMOTE, 3, "   Data: %s", Temp.c_str());
+		DEBUG_LOG(WII_IPC_WIIMOTE, "   Channel: %u", _channelID);
-		//LOGV(WII_IPC_WIIMOTE, 3, "   Channel: %u", _channelID);
 
 		s_Usb->m_WiiMotes[0].SendL2capData(_channelID, _pData, _Size);
 		DEBUG_LOG(WII_IPC_WIIMOTE, "=========================================================");

Source/Core/DiscIO/DiscIO.vcproj

@@ -45,7 +45,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Common\Src"
+				AdditionalIncludeDirectories="..\Common\Src;..\..\..\Externals\zlib"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_SECURE_SCL=0"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -110,7 +110,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\Common\Src"
+				AdditionalIncludeDirectories="..\Common\Src;..\..\..\Externals\zlib"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -173,7 +173,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\Common\Src"
+				AdditionalIncludeDirectories="..\Common\Src;..\..\..\Externals\zlib"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
 				RuntimeLibrary="0"
 				EnableEnhancedInstructionSet="2"
@@ -237,7 +237,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="..\Common\Src"
+				AdditionalIncludeDirectories="..\Common\Src;..\..\..\Externals\zlib"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="2"
@@ -298,7 +298,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\Common\Src"
+				AdditionalIncludeDirectories="..\Common\Src;..\..\..\Externals\zlib"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;"
 				RuntimeLibrary="0"
 				EnableEnhancedInstructionSet="2"
@@ -361,7 +361,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\Common\Src"
+				AdditionalIncludeDirectories="..\Common\Src;..\..\..\Externals\zlib"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="2"
@@ -532,6 +532,14 @@
 		<Filter
 			Name="Volume"
 			>
+			<File
+				RelativePath=".\Src\FileMonitor.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\FileMonitor.h"
+				>
+			</File>
 			<File
 				RelativePath=".\Src\Volume.h"
 				>
@@ -648,15 +656,6 @@
 				RelativePath=".\Src\VolumeDirectory.cpp"
 				>
 			</File>
-			<File
-			   RelativePath=".\Src\FileMonitor.cpp"
-			   >
-			</File>
-			<File
-			   RelativePath=".\Src\FileMonitor.h"
-			   >
-			</File>
-
 			<File
 				RelativePath=".\Src\VolumeDirectory.h"
 				>

Source/Core/DiscIO/Src/CompressedBlob.cpp

@@ -30,12 +30,7 @@
 #include "FileUtil.h"
 #include "Hash.h"
 
-#ifdef _WIN32
+#include "zlib.h"
-#include "../../../../Externals/zlib/zlib.h"
-#else
-// TODO: Include generic zlib.h
-#include "../../../../Externals/zlib/zlib.h"
-#endif
 
 namespace DiscIO
 {

Source/Dolphin.sln

@@ -36,6 +36,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\Externals\zlib\z
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DiscIO", "Core\DiscIO\DiscIO.vcproj", "{B7F1A9FB-BEA8-416E-9460-AE35A6A5165C}"
 	ProjectSection(ProjectDependencies) = postProject
+		{3E03C179-8251-46E4-81F4-466F114BAC63} = {3E03C179-8251-46E4-81F4-466F114BAC63}
 		{C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9}
 	EndProjectSection
 EndProject
@@ -696,6 +697,22 @@ Global
 		{66A4E7BD-E2E8-4373-9B75-8750EB5AE683}.Release|Win32.Build.0 = Release|Win32
 		{66A4E7BD-E2E8-4373-9B75-8750EB5AE683}.Release|x64.ActiveCfg = Release|x64
 		{66A4E7BD-E2E8-4373-9B75-8750EB5AE683}.Release|x64.Build.0 = Release|x64
+		{E251479F-74CD-462C-90E4-0F8345AA6628}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E251479F-74CD-462C-90E4-0F8345AA6628}.Debug|Win32.Build.0 = Debug|Win32
+		{E251479F-74CD-462C-90E4-0F8345AA6628}.Debug|x64.ActiveCfg = Debug|x64
+		{E251479F-74CD-462C-90E4-0F8345AA6628}.Debug|x64.Build.0 = Debug|x64
+		{E251479F-74CD-462C-90E4-0F8345AA6628}.DebugFast|Win32.ActiveCfg = Release|Win32
+		{E251479F-74CD-462C-90E4-0F8345AA6628}.DebugFast|Win32.Build.0 = Release|Win32
+		{E251479F-74CD-462C-90E4-0F8345AA6628}.DebugFast|x64.ActiveCfg = Release|x64
+		{E251479F-74CD-462C-90E4-0F8345AA6628}.DebugFast|x64.Build.0 = Release|x64
+		{E251479F-74CD-462C-90E4-0F8345AA6628}.Release_JITIL|Win32.ActiveCfg = Release|Win32
+		{E251479F-74CD-462C-90E4-0F8345AA6628}.Release_JITIL|Win32.Build.0 = Release|Win32
+		{E251479F-74CD-462C-90E4-0F8345AA6628}.Release_JITIL|x64.ActiveCfg = Release|x64
+		{E251479F-74CD-462C-90E4-0F8345AA6628}.Release_JITIL|x64.Build.0 = Release|x64
+		{E251479F-74CD-462C-90E4-0F8345AA6628}.Release|Win32.ActiveCfg = Release|Win32
+		{E251479F-74CD-462C-90E4-0F8345AA6628}.Release|Win32.Build.0 = Release|Win32
+		{E251479F-74CD-462C-90E4-0F8345AA6628}.Release|x64.ActiveCfg = Release|x64
+		{E251479F-74CD-462C-90E4-0F8345AA6628}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE