x64 build fix here we go

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

5 files changed, 10 insertions, 10 deletions

diff --git a/Source/Core/DolphinWX/DolphinWX.vcproj b/Source/Core/DolphinWX/DolphinWX.vcproj
index fb3811fa83..566826048b 100644
--- a/Source/Core/DolphinWX/DolphinWX.vcproj
+++ b/Source/Core/DolphinWX/DolphinWX.vcproj
@@ -172,7 +172,7 @@
 				EnableIntrinsicFunctions="true"

 				FavorSizeOrSpeed="1"

 				OmitFramePointers="false"

-				AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\DebuggerWX\src;..\DiscIO\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"

+				AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\DebuggerWX\src;..\DiscIO\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\SFML\include"

 				PreprocessorDefinitions="WIN32;__WXMSW__;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"

 				StringPooling="true"

 				RuntimeLibrary="0"

@@ -391,7 +391,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\DebuggerWX\src;..\DiscIO\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"

+				AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\DebuggerWX\src;..\DiscIO\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\SFML\include"

 				PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

@@ -617,7 +617,7 @@
 				InlineFunctionExpansion="1"

 				EnableIntrinsicFunctions="true"

 				FavorSizeOrSpeed="1"

-				AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\DebuggerWX\src;..\DiscIO\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"

+				AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\DebuggerWX\src;..\DiscIO\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\SFML\include"

 				PreprocessorDefinitions="DEBUGFAST;WIN32;__WXMSW__;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS"

 				StringPooling="true"

 				RuntimeLibrary="0"

@@ -844,7 +844,7 @@
 				EnableIntrinsicFunctions="true"

 				FavorSizeOrSpeed="1"

 				OmitFramePointers="false"

-				AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\DebuggerWX\src;..\DiscIO\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"

+				AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\DebuggerWX\src;..\DiscIO\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc;..\..\..\Externals\SFML\include"

 				PreprocessorDefinitions="WIN32;__WXMSW__;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS"

 				StringPooling="true"

 				RuntimeLibrary="0"

diff --git a/Source/Core/DolphinWX/Src/NetEvent.cpp b/Source/Core/DolphinWX/Src/NetEvent.cpp
index c12eb670cc..80cd8bf536 100644
--- a/Source/Core/DolphinWX/Src/NetEvent.cpp
+++ b/Source/Core/DolphinWX/Src/NetEvent.cpp
@@ -216,7 +216,7 @@ void ServerSide::OnServerData(char sock, unsigned char data)
 

 				wxString error_str = wxString::Format(

 					wxT("WARNING : Player %s does Not have this Game !\n"), m_client[sock].nick.c_str());

-				four_bytes = error_str.size();

+				four_bytes = (int)error_str.size();

 

 				for (char i=0; i < 2; i++)

 					Event->AppendText(error_str);

diff --git a/Source/Core/DolphinWX/Src/NetFunctions.cpp b/Source/Core/DolphinWX/Src/NetFunctions.cpp
index fd4c65b8f1..4ac111f5e5 100644
--- a/Source/Core/DolphinWX/Src/NetFunctions.cpp
+++ b/Source/Core/DolphinWX/Src/NetFunctions.cpp
@@ -343,7 +343,7 @@ void NetPlay::ChangeSelectedGame(std::string game)
 	if (game != m_selectedGame)

 	{

 		unsigned char value = 0x35;

-		int game_size = game.size();

+		int game_size = (int)game.size();

 

 		// Send command then Game String

 		for (int i=0; i < m_numClients ; i++)

diff --git a/Source/Core/DolphinWX/Src/NetSockets.cpp b/Source/Core/DolphinWX/Src/NetSockets.cpp
index 03da1f36a4..5cc1ddd38c 100644
--- a/Source/Core/DolphinWX/Src/NetSockets.cpp
+++ b/Source/Core/DolphinWX/Src/NetSockets.cpp
@@ -156,7 +156,7 @@ void *ServerSide::Entry()
 

 						// Send disconnected message to all

 						unsigned char send = 0x11;

-						unsigned int str_size = player_left.size();

+						unsigned int str_size = (int)player_left.size();

 

 						for (int i=0; i < m_numplayers ; i++)

 						{

@@ -384,7 +384,7 @@ void *ClientSide::Entry()
 

 bool ClientSide::SyncValues()

 {

-	unsigned int buffer_size = m_nick.size();

+	unsigned int buffer_size = (int)m_nick.size();

 	char *buffer = NULL;

 	size_t recv_size;

 

diff --git a/Source/Core/DolphinWX/Src/NetWindow.cpp b/Source/Core/DolphinWX/Src/NetWindow.cpp
index 7d58ba79a7..c098ef9fd9 100644
--- a/Source/Core/DolphinWX/Src/NetWindow.cpp
+++ b/Source/Core/DolphinWX/Src/NetWindow.cpp
@@ -335,7 +335,7 @@ void NetPlay::OnGUIEvent(wxCommandEvent& event)
 			{

 				if (m_numClients > 0)

 				{

-					int buffer_size = buffer.size();

+					int buffer_size = (int)buffer.size();

 					for (int i=0; i < m_numClients ; i++)

 					{

 						m_sock_server->Write(i, (const char*)&value, 1);

@@ -407,7 +407,7 @@ void NetPlay::OnGUIEvent(wxCommandEvent& event)
 		{

 			value = 0x30;

 			wxString chat_str = wxString::Format(wxT("> %s : %s\n"), m_nick.c_str(), m_Chat->GetValue().c_str());

-			int chat_size = chat_str.size(); 

+			int chat_size = (int)chat_str.size(); 

 

 			// If there's no distant connection, we write but we don't send

 			if (m_numClients == 0) {