mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-23 06:09:50 -06:00
Netplay build fix for linux, and a little clean up.
For some reason something in (or included in) Frame.h messes up the SFML inclusion in NetPlay.cpp. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5426 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
@ -186,9 +186,7 @@ void CFrame::CreateMenu()
|
||||
toolsMenu->Append(IDM_IMPORTSAVE, _T("Wii Save Import (experimental)"));
|
||||
toolsMenu->Append(IDM_CHEATS, _T("Action &Replay Manager"));
|
||||
|
||||
#if defined(HAVE_SFML) && HAVE_SFML
|
||||
toolsMenu->Append(IDM_NETPLAY, _T("Start &NetPlay"));
|
||||
#endif
|
||||
|
||||
if (DiscIO::CNANDContentManager::Access().GetNANDLoader(std::string (File::GetUserPath(D_WIIMENU_IDX))).IsValid())
|
||||
{
|
||||
@ -998,9 +996,7 @@ void CFrame::StatusBarMessage(const char * Text, ...)
|
||||
// NetPlay stuff
|
||||
void CFrame::OnNetPlay(wxCommandEvent& WXUNUSED (event))
|
||||
{
|
||||
#if defined(HAVE_SFML) && HAVE_SFML
|
||||
new NetPlaySetupDiag(this, m_GameListCtrl);
|
||||
#endif
|
||||
}
|
||||
|
||||
void CFrame::OnMemcard(wxCommandEvent& WXUNUSED (event))
|
||||
|
Reference in New Issue
Block a user