piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-30 09:39:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

DiscIO.vcproj depends on zlib...

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4590 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Shawn Hoffman
2009-11-19 03:12:14 +00:00
parent fe1a5142a7
commit 651b5addf4
4 changed files with 34 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp
View File

@ -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);
//LOGV(WII_IPC_WIIMOTE, 3, " Data: %s", Temp.c_str());
//LOGV(WII_IPC_WIIMOTE, 3, " Channel: %u", _channelID);
DEBUG_LOG(WII_IPC_WIIMOTE, " Data: %s", ArrayToString(pData, _Size, 0, 50).c_str());
DEBUG_LOG(WII_IPC_WIIMOTE, " Channel: %u", _channelID);
s_Usb->m_WiiMotes[0].SendL2capData(_channelID, _pData, _Size);
DEBUG_LOG(WII_IPC_WIIMOTE, "=========================================================");

29
Source/Core/DiscIO/DiscIO.vcproj
View File

@ -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"
>

7
Source/Core/DiscIO/Src/CompressedBlob.cpp
View File

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