diff --git a/Source/Core/Common/Src/Common.h b/Source/Core/Common/Src/Common.h index 12b36fbb3f..b254076165 100644 --- a/Source/Core/Common/Src/Common.h +++ b/Source/Core/Common/Src/Common.h @@ -86,7 +86,6 @@ #define HAVE_OPENAL 1 #define HAVE_ALSA 0 #define HAVE_PORTAUDIO 0 - #define HAVE_SFML 1 // it is VERY DANGEROUS to mix _SECURE_SCL=0 and _SECURE_SCL=1 compiled libraries. // You will get bizarre crash bugs whenever you use STL. diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index 497109d38b..a61e0dbbb3 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -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)) diff --git a/Source/Core/DolphinWX/Src/NetPlay.cpp b/Source/Core/DolphinWX/Src/NetPlay.cpp index aecf0e0a8d..a1580d4c79 100644 --- a/Source/Core/DolphinWX/Src/NetPlay.cpp +++ b/Source/Core/DolphinWX/Src/NetPlay.cpp @@ -18,11 +18,11 @@ #include "HW/SI_DeviceGCController.h" #include "HW/EXI_DeviceIPL.h" -#include "Frame.h" - #include "NetPlay.h" #include "NetWindow.h" +#include "Frame.h" + #include <sstream> // this will be removed soon diff --git a/Source/Core/DolphinWX/Src/NetWindow.cpp b/Source/Core/DolphinWX/Src/NetWindow.cpp index 166f5ceb07..242b49f323 100644 --- a/Source/Core/DolphinWX/Src/NetWindow.cpp +++ b/Source/Core/DolphinWX/Src/NetWindow.cpp @@ -221,8 +221,8 @@ void NetPlaySetupDiag::OnQuit(wxCommandEvent& event) NetPlayDiag::NetPlayDiag(wxWindow* parent, const CGameListCtrl* const game_list , const std::string& game, const bool is_hosting) : wxFrame(parent, wxID_ANY, wxT(NETPLAY_TITLEBAR), wxDefaultPosition, wxDefaultSize) - , m_game_list(game_list) , m_selected_game(game) + , m_game_list(game_list) { wxPanel* const panel = new wxPanel(this);