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

Fix GCC 4.5 Compiling. -fvisibility=hidden seems to break it, so it was removed. Non-POD objects are now errors instead of warnings in 4.5, so I had to remove the wxString::Format. and a Fix where GCC 4.5 introduced strndup. Compiling with nowx=true gave me linker problems for some reason, and I added the -flto flag but commented out. Dunno what it will do yet.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4530 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Sonicadvance1
2009-11-11 11:07:04 +00:00
parent e4ec0ba33b
commit ebc696c58e
5 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/Common/Src/Misc.cpp
View File

@ -45,7 +45,7 @@ size_t strnlen(const char *s, size_t n)
return(p ? p-s : n);
}
#endif
#if defined(_WIN32) || !(__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
// strdup with cropping after size n
char* strndup(char const *s, size_t n)
{
@ -58,3 +58,4 @@ char* strndup(char const *s, size_t n)
dup[len] = '\0';
return (char *)memcpy(dup, s, len);
}
#endif

8
Source/Core/DolphinWX/Src/GameListCtrl.cpp
View File

@ -747,9 +747,11 @@ void CGameListCtrl::OnMouseMotion(wxMouseEvent& event)
// Show a tooltip containing the EmuState and the state description
if (nState > 0 && nState < 6)
toolTip = new wxEmuStateTip(this, wxString::Format(wxT(" ^ %s%s%s"),
wxString::FromAscii(emuState[nState - 1].c_str()), issues.size() > 0 ? wxT(" :\n") : wxT(""),
wxString::FromAscii(issues.c_str())), &toolTip);
{
char temp[2048];
sprintf(temp, "^ %s%s%s", emuState[nState -1].c_str(), issues.size() > 0 ? " :\n" : "", issues.c_str());
toolTip = new wxEmuStateTip(this, wxString::FromAscii(temp), &toolTip);
}
else
toolTip = new wxEmuStateTip(this, wxT("Not Set"), &toolTip);

2
Source/Core/InputCommon/Src/EventHandler.cpp
View File

@ -1,4 +1,6 @@
#include "EventHandler.h"
#include <stdio.h>
#include <ctype.h>
#if defined HAVE_WX && HAVE_WX
#include <wx/wx.h>