mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-27 06:35:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

x64 build fix here we go

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3222 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
sl1nk3.s 2009-05-13 22:27:42 +00:00
parent b9cdcb1819
commit 560c4111ae
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/DolphinWX/DolphinWX.vcproj
View File

@ -172,7 +172,7 @@
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
OmitFramePointers="false" 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" PreprocessorDefinitions="WIN32;__WXMSW__;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
StringPooling="true" StringPooling="true"
RuntimeLibrary="0" RuntimeLibrary="0"
@ -391,7 +391,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" 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" PreprocessorDefinitions="WIN32;_DEBUG;__WXMSW__;__WXDEBUG__;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -617,7 +617,7 @@
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1" 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" PreprocessorDefinitions="DEBUGFAST;WIN32;__WXMSW__;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS"
StringPooling="true" StringPooling="true"
RuntimeLibrary="0" RuntimeLibrary="0"
@ -844,7 +844,7 @@
EnableIntrinsicFunctions="true" EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
OmitFramePointers="false" 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" PreprocessorDefinitions="WIN32;__WXMSW__;_WINDOWS;NOPCH;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS"
StringPooling="true" StringPooling="true"
RuntimeLibrary="0" RuntimeLibrary="0"

2
Source/Core/DolphinWX/Src/NetEvent.cpp
View File

@ -216,7 +216,7 @@ void ServerSide::OnServerData(char sock, unsigned char data)
wxString error_str = wxString::Format( wxString error_str = wxString::Format(
wxT("WARNING : Player %s does Not have this Game !\n"), m_client[sock].nick.c_str()); 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++) for (char i=0; i < 2; i++)
Event->AppendText(error_str); Event->AppendText(error_str);

2
Source/Core/DolphinWX/Src/NetFunctions.cpp
View File

@ -343,7 +343,7 @@ void NetPlay::ChangeSelectedGame(std::string game)
if (game != m_selectedGame) if (game != m_selectedGame)
{ {
unsigned char value = 0x35; unsigned char value = 0x35;
int game_size = game.size(); int game_size = (int)game.size();
// Send command then Game String // Send command then Game String
for (int i=0; i < m_numClients ; i++) for (int i=0; i < m_numClients ; i++)

4
Source/Core/DolphinWX/Src/NetSockets.cpp
View File

@ -156,7 +156,7 @@ void *ServerSide::Entry()
// Send disconnected message to all // Send disconnected message to all
unsigned char send = 0x11; 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++) for (int i=0; i < m_numplayers ; i++)
{ {
@ -384,7 +384,7 @@ void *ClientSide::Entry()
bool ClientSide::SyncValues() bool ClientSide::SyncValues()
{ {
unsigned int buffer_size = m_nick.size(); unsigned int buffer_size = (int)m_nick.size();
char *buffer = NULL; char *buffer = NULL;
size_t recv_size; size_t recv_size;

4
Source/Core/DolphinWX/Src/NetWindow.cpp
View File

@ -335,7 +335,7 @@ void NetPlay::OnGUIEvent(wxCommandEvent& event)
{ {
if (m_numClients > 0) if (m_numClients > 0)
{ {
int buffer_size = buffer.size(); int buffer_size = (int)buffer.size();
for (int i=0; i < m_numClients ; i++) for (int i=0; i < m_numClients ; i++)
{ {
m_sock_server->Write(i, (const char*)&value, 1); m_sock_server->Write(i, (const char*)&value, 1);
@ -407,7 +407,7 @@ void NetPlay::OnGUIEvent(wxCommandEvent& event)
{ {
value = 0x30; value = 0x30;
wxString chat_str = wxString::Format(wxT("> %s : %s\n"), m_nick.c_str(), m_Chat->GetValue().c_str()); 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 there's no distant connection, we write but we don't send
if (m_numClients == 0) { if (m_numClients == 0) {