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

added HAVE_SFML so the code compiles without it

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3221 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee
2009-05-13 22:23:54 +00:00
parent 176d528719
commit b9cdcb1819
5 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/DolphinWX/Src/Frame.h
View File

@ -16,9 +16,6 @@
// http://code.google.com/p/dolphin-emu/
//////////////////////////////////////////////////////////////////////////
// Includes
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
#ifndef __FRAME_H_
#define __FRAME_H_
@ -26,12 +23,11 @@
#include <wx/busyinfo.h>
#include <wx/mstream.h>
#include <wx/listctrl.h>
////////////////////////////////
#include "CDUtils.h"
#include "LogWindow.h"
//////////////////////////////////////////////////////////////////////////
// A shortcut to access the bitmaps
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
#define wxGetBitmapFromMemory(name) _wxGetBitmapFromMemory(name, sizeof(name))
inline wxBitmap _wxGetBitmapFromMemory(const unsigned char* data, int length)
{

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

@ -17,24 +17,21 @@
//////////////////////////////////////////////////////////////////////////////////////////
// Windows
/* ¯¯¯¯¯¯¯¯¯¯¯¯¯¯
CFrame is the main parent window. Inside CFrame there is m_Panel which is the parent for
the rendering window (when we render to the main window). In Windows the rendering window is
created by giving CreateWindow() m_Panel->GetHandle() as parent window and creating a new
child window to m_Panel. The new child window handle that is returned by CreateWindow() can
be accessed from Core::GetWindowHandle().
///////////////////////////////////////////////*/
/*
CFrame is the main parent window. Inside CFrame there is m_Panel which is the
parent for the rendering window (when we render to the main window). In Windows
the rendering window is created by giving CreateWindow() m_Panel->GetHandle()
as parent window and creating a new child window to m_Panel. The new child
window handle that is returned by CreateWindow() can be accessed from
Core::GetWindowHandle().
*/
// ----------------------------------------------------------------------------
// Includes
// ----------------------------------------------------------------------------
#if defined(HAVE_SFML) && HAVE_SFML
#include "NetWindow.h"
#endif
#include "Globals.h" // Local
#include "Frame.h"
@ -654,9 +651,13 @@ void CFrame::OnHelp(wxCommandEvent& event)
// NetPlay stuff
void CFrame::OnNetPlay(wxCommandEvent& WXUNUSED (event))
{
#if defined(HAVE_SFML) && HAVE_SFML
new NetPlay(this, m_GameListCtrl->GetGamePaths(), m_GameListCtrl->GetGameNames());
#endif
}
// Miscellaneous menu
void CFrame::OnMemcard(wxCommandEvent& WXUNUSED (event))
{

8
Source/Core/DolphinWX/Src/SConscript
View File

@ -43,7 +43,13 @@ if wxenv['HAVE_WX']:
],
libs = [ 'debwx' ] + libs
if wxenv['HAVE_SFML']:
files += [
'NetEvent.cpp',
'NetFunctions.cpp',
'NetSockets.cpp',
'NetWindow.cpp',
]
if wxenv['HAVE_COCOA']:
files += [ 'cocoaApp.m', ]