diff --git a/Source/Core/Core/Src/HW/EXI_DeviceEthernet.cpp b/Source/Core/Core/Src/HW/EXI_DeviceEthernet.cpp index fb6e0871ab..639cc0ade4 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceEthernet.cpp +++ b/Source/Core/Core/Src/HW/EXI_DeviceEthernet.cpp @@ -125,7 +125,6 @@ void CEXIETHERNET::recordSendComplete() } // TODO why did sonic put this here? //startRecv(); - mPacketsSent++; } bool CEXIETHERNET::checkRecvBuffer() diff --git a/Source/Core/Core/Src/HW/EXI_DeviceEthernet.h b/Source/Core/Core/Src/HW/EXI_DeviceEthernet.h index a9f352c8b1..cecb23e6ce 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceEthernet.h +++ b/Source/Core/Core/Src/HW/EXI_DeviceEthernet.h @@ -232,8 +232,6 @@ enum EXPECT_ID }; -static u32 mPacketsSent = 0; - class CEXIETHERNET : public IEXIDevice { public: diff --git a/Source/Core/DiscIO/CMakeLists.txt b/Source/Core/DiscIO/CMakeLists.txt index 34cfc8f4ce..7f6ff7e4cc 100644 --- a/Source/Core/DiscIO/CMakeLists.txt +++ b/Source/Core/DiscIO/CMakeLists.txt @@ -2,14 +2,15 @@ set(SRCS Src/BannerLoader.cpp Src/BannerLoaderGC.cpp Src/BannerLoaderWii.cpp Src/Blob.cpp + Src/CISOBlob.cpp Src/CompressedBlob.cpp Src/DiscScrubber.cpp Src/DriveBlob.cpp Src/FileBlob.cpp Src/FileHandlerARC.cpp Src/FileMonitor.cpp - Src/Filesystem.cpp Src/FileSystemGCWii.cpp + Src/Filesystem.cpp Src/NANDContentLoader.cpp Src/VolumeCommon.cpp Src/VolumeCreator.cpp diff --git a/Source/Core/DiscIO/Src/CISOBlob.cpp b/Source/Core/DiscIO/Src/CISOBlob.cpp index 7addf252f5..81de9e1e2f 100644 --- a/Source/Core/DiscIO/Src/CISOBlob.cpp +++ b/Source/Core/DiscIO/Src/CISOBlob.cpp @@ -15,7 +15,9 @@ // Official SVN repository and contact information can be found at // http://code.google.com/p/dolphin-emu/ +#ifdef _WIN32 #include "stdafx.h" +#endif #include "Blob.h" #include "CISOBlob.h" diff --git a/Source/Core/DiscIO/Src/SConscript b/Source/Core/DiscIO/Src/SConscript index 374f4b575b..7126b178ca 100644 --- a/Source/Core/DiscIO/Src/SConscript +++ b/Source/Core/DiscIO/Src/SConscript @@ -8,6 +8,7 @@ files = [ 'BannerLoaderWii.cpp', 'Blob.cpp', 'CompressedBlob.cpp', + 'CISOBlob.cpp', 'DriveBlob.cpp', 'DiscScrubber.cpp', 'FileBlob.cpp', diff --git a/Source/Core/VideoCommon/Src/BPFunctions.cpp b/Source/Core/VideoCommon/Src/BPFunctions.cpp index 9cdd8152ed..ba0c1db519 100644 --- a/Source/Core/VideoCommon/Src/BPFunctions.cpp +++ b/Source/Core/VideoCommon/Src/BPFunctions.cpp @@ -187,7 +187,7 @@ void OnPixelFormatChange(const BPCmd &bp) default: break; } - if (convtype == (unsigned int)-1) + if (convtype == -1) { PanicAlert("Unhandled EFB format change: %d to %d\n", old_format, new_format); goto skip;