From 5123ece26aa3568fc8277dbcf2f6992f3c1d8507 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Sat, 24 Oct 2009 01:00:45 +0000 Subject: [PATCH] fix some warnings, compile Plugin_VideoSoftware against the plain multithreaded version of libc instead of the MT DLL version. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4460 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Core/Src/HW/SI_DeviceAMBaseboard.cpp | 4 ++-- Source/Core/DiscIO/Src/FileSystemGCWii.cpp | 2 +- Source/Dolphin.sln | 1 + .../Plugin_VideoSoftware/Plugin_VideoSoftware.vcproj | 12 ++++++------ 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Source/Core/Core/Src/HW/SI_DeviceAMBaseboard.cpp b/Source/Core/Core/Src/HW/SI_DeviceAMBaseboard.cpp index 0c1d16121e..3af82f4c23 100644 --- a/Source/Core/Core/Src/HW/SI_DeviceAMBaseboard.cpp +++ b/Source/Core/Core/Src/HW/SI_DeviceAMBaseboard.cpp @@ -44,7 +44,7 @@ public: m_csum = 0; addData(hdr, 3, 1); } - void addData(void *data, int len) + void addData(void *data, size_t len) { addData((unsigned char*)data, len); } @@ -65,7 +65,7 @@ public: addData(m_csum + len - 2); } - void addData(unsigned char *dst, int len, int sync = 0) + void addData(unsigned char *dst, size_t len, int sync = 0) { while (len--) { diff --git a/Source/Core/DiscIO/Src/FileSystemGCWii.cpp b/Source/Core/DiscIO/Src/FileSystemGCWii.cpp index 4457a25d63..163046a5b1 100644 --- a/Source/Core/DiscIO/Src/FileSystemGCWii.cpp +++ b/Source/Core/DiscIO/Src/FileSystemGCWii.cpp @@ -145,7 +145,7 @@ bool CFileSystemGCWii::ExportApploader(const char* _rExportFolder) const bool CFileSystemGCWii::ExportDOL(const char* _rExportFolder) const { u32 DolOffset = Read32(0x420) << m_OffsetShift; - u32 DolSize, offset = 0, size = 0; + u32 DolSize = 0, offset = 0, size = 0; // Iterate through the 7 code segments for (u8 i = 0; i < 7; i++) diff --git a/Source/Dolphin.sln b/Source/Dolphin.sln index bd4dda02fd..c8b14c01dd 100644 --- a/Source/Dolphin.sln +++ b/Source/Dolphin.sln @@ -194,6 +194,7 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_VideoSoftware", "Plugins\Plugin_VideoSoftware\Plugin_VideoSoftware.vcproj", "{66A4E7BD-E2E8-4373-9B75-8750EB5AE683}" ProjectSection(ProjectDependencies) = postProject {11F55366-12EC-4C44-A8CB-1D4E315D61ED} = {11F55366-12EC-4C44-A8CB-1D4E315D61ED} + {E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA} = {E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA} {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} EndProjectSection diff --git a/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcproj b/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcproj index b4afafce71..0d776da6c1 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcproj +++ b/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcproj @@ -74,7 +74,7 @@ OutputFile="..\..\..\Binary\Win32/Plugins\Plugin_VideoSWD.dll" LinkIncremental="1" AdditionalLibraryDirectories=""..\..\core\common\$(PlatformName)\$(ConfigurationName)";..\..\..\Externals\Cg;..\..\..\Externals\GLew;..\..\..\Externals\libjpeg;"..\..\..\Externals\wxWidgets\lib\vc_lib\$(PlatformName)"" - IgnoreDefaultLibraryNames="msvcprt.lib;libcmt.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="true" ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\$(TargetName).pdb" SubSystem="0" @@ -162,7 +162,7 @@ LinkIncremental="1" AdditionalLibraryDirectories=""..\..\core\common\$(PlatformName)\$(ConfigurationName)";..\..\..\Externals\Cg;..\..\..\Externals\GLew;..\..\..\Externals\libjpeg;"..\..\..\Externals\wxWidgets\lib\vc_lib\$(PlatformName)"" IgnoreAllDefaultLibraries="false" - IgnoreDefaultLibraryNames="msvcprt.lib;libcmt.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="true" ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\$(TargetName).pdb" SubSystem="0" @@ -222,7 +222,7 @@ EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="../../PluginSpecs;../../Core/Common/Src;../../Core/InputCommon/Src;./Src;./Src/Windows;../../../Externals;..\..\..\Externals\libjpeg;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\Glew" PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;_WIN32;PLUGIN_VIDEOSOFTWARE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0" - RuntimeLibrary="2" + RuntimeLibrary="0" EnableFunctionLevelLinking="true" UsePrecompiledHeader="2" PrecompiledHeaderThrough="stdafx.h" @@ -248,7 +248,7 @@ LinkIncremental="1" AdditionalLibraryDirectories=""..\..\core\common\$(PlatformName)\$(ConfigurationName)";..\..\..\Externals\Cg;..\..\..\Externals\GLew;..\..\..\Externals\libjpeg;"..\..\..\Externals\wxWidgets\lib\vc_lib\$(PlatformName)"" IgnoreAllDefaultLibraries="false" - IgnoreDefaultLibraryNames="msvcprt.lib;libcmt.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="true" ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\$(TargetName).pdb" SubSystem="2" @@ -309,7 +309,7 @@ EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="../../PluginSpecs;../../Core/Common/Src;../../Core/InputCommon/Src;./Src;./Src/Windows;../../../Externals;..\..\..\Externals\libjpeg;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\Glew" PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;_WIN32;PLUGIN_VIDEOSOFTWARE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0" - RuntimeLibrary="2" + RuntimeLibrary="0" EnableFunctionLevelLinking="true" UsePrecompiledHeader="2" PrecompiledHeaderThrough="stdafx.h" @@ -335,7 +335,7 @@ LinkIncremental="1" AdditionalLibraryDirectories=""..\..\core\common\$(PlatformName)\$(ConfigurationName)";..\..\..\Externals\Cg;..\..\..\Externals\GLew;..\..\..\Externals\libjpeg;"..\..\..\Externals\wxWidgets\lib\vc_lib\$(PlatformName)"" IgnoreAllDefaultLibraries="false" - IgnoreDefaultLibraryNames="msvcprt.lib;libcmt.lib" + IgnoreDefaultLibraryNames="" GenerateDebugInformation="true" ProgramDatabaseFile="$(PlatformName)\$(ConfigurationName)\$(TargetName).pdb" SubSystem="2"