ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
Glenn Rice 2010-05-01 21:27:48 +00:00
parent a6d6d27328
commit b2e0dc2519
4 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/Common/Src/Common.h
View File

@ -86,7 +86,6 @@
#define HAVE_OPENAL 1 #define HAVE_OPENAL 1
#define HAVE_ALSA 0 #define HAVE_ALSA 0
#define HAVE_PORTAUDIO 0 #define HAVE_PORTAUDIO 0
#define HAVE_SFML 1
// it is VERY DANGEROUS to mix _SECURE_SCL=0 and _SECURE_SCL=1 compiled libraries. // 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. // You will get bizarre crash bugs whenever you use STL.

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

@ -186,9 +186,7 @@ void CFrame::CreateMenu()
toolsMenu->Append(IDM_IMPORTSAVE, _T("Wii Save Import (experimental)")); toolsMenu->Append(IDM_IMPORTSAVE, _T("Wii Save Import (experimental)"));
toolsMenu->Append(IDM_CHEATS, _T("Action &Replay Manager")); toolsMenu->Append(IDM_CHEATS, _T("Action &Replay Manager"));
#if defined(HAVE_SFML) && HAVE_SFML
toolsMenu->Append(IDM_NETPLAY, _T("Start &NetPlay")); toolsMenu->Append(IDM_NETPLAY, _T("Start &NetPlay"));
#endif
if (DiscIO::CNANDContentManager::Access().GetNANDLoader(std::string (File::GetUserPath(D_WIIMENU_IDX))).IsValid()) 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 // NetPlay stuff
void CFrame::OnNetPlay(wxCommandEvent& WXUNUSED (event)) void CFrame::OnNetPlay(wxCommandEvent& WXUNUSED (event))
{ {
#if defined(HAVE_SFML) && HAVE_SFML
new NetPlaySetupDiag(this, m_GameListCtrl); new NetPlaySetupDiag(this, m_GameListCtrl);
#endif
} }
void CFrame::OnMemcard(wxCommandEvent& WXUNUSED (event)) void CFrame::OnMemcard(wxCommandEvent& WXUNUSED (event))

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

@ -18,11 +18,11 @@
#include "HW/SI_DeviceGCController.h" #include "HW/SI_DeviceGCController.h"
#include "HW/EXI_DeviceIPL.h" #include "HW/EXI_DeviceIPL.h"
#include "Frame.h"
#include "NetPlay.h" #include "NetPlay.h"
#include "NetWindow.h" #include "NetWindow.h"
#include "Frame.h"
#include <sstream> #include <sstream>
// this will be removed soon // this will be removed soon

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

@ -221,8 +221,8 @@ void NetPlaySetupDiag::OnQuit(wxCommandEvent& event)
NetPlayDiag::NetPlayDiag(wxWindow* parent, const CGameListCtrl* const game_list NetPlayDiag::NetPlayDiag(wxWindow* parent, const CGameListCtrl* const game_list
, const std::string& game, const bool is_hosting) , const std::string& game, const bool is_hosting)
: wxFrame(parent, wxID_ANY, wxT(NETPLAY_TITLEBAR), wxDefaultPosition, wxDefaultSize) : wxFrame(parent, wxID_ANY, wxT(NETPLAY_TITLEBAR), wxDefaultPosition, wxDefaultSize)
, m_game_list(game_list)
, m_selected_game(game) , m_selected_game(game)
, m_game_list(game_list)
{ {
wxPanel* const panel = new wxPanel(this); wxPanel* const panel = new wxPanel(this);