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

SFML on linux/osx now compiles from external (static)

Browse Source 
removed HAVE_SFML ifdefs


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5101 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee
2010-02-21 20:09:49 +00:00
parent 3dc3c1c3b3
commit 7de17cb9c2
9 changed files with 36 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Core/DolphinWX/Src/Frame.cpp
View File

@ -16,15 +16,13 @@
// http://code.google.com/p/dolphin-emu/
// CFrame is the main parent window. Inside CFrame there is an m_Panel that 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
// CFrame is the main parent window. Inside CFrame there is an m_Panel that 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
#include "Common.h" // Common
#include "FileUtil.h"
#include "Timer.h"
@ -252,11 +250,7 @@ EVT_MENU(IDM_FLOAT_JITWINDOW, CFrame::OnFloatWindow)
EVT_MENU(IDM_FLOAT_SOUNDWINDOW, CFrame::OnFloatWindow)
EVT_MENU(IDM_FLOAT_VIDEOWINDOW, CFrame::OnFloatWindow)
#if defined(HAVE_SFML) && HAVE_SFML
EVT_MENU(IDM_NETPLAY, CFrame::OnNetPlay)
#endif
EVT_MENU(IDM_BROWSE, CFrame::OnBrowse)
EVT_MENU(IDM_MEMCARD, CFrame::OnMemcard)
EVT_MENU(IDM_IMPORTSAVE, CFrame::OnImportSave)

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

@ -18,9 +18,7 @@
#include "Setup.h" // Common
#if defined(HAVE_SFML) && HAVE_SFML || defined(_WIN32)
#include "NetWindow.h"
#endif
#include "Common.h" // Common
#include "FileUtil.h"

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

@ -35,10 +35,7 @@ Core::GetWindowHandle().
#include "Setup.h" // Common
#if defined(HAVE_SFML) && HAVE_SFML || defined(_WIN32)
#include "NetWindow.h"
#endif
#include "Common.h" // Common
#include "FileUtil.h"
#include "FileSearch.h"

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

@ -12,7 +12,7 @@ files = [
libs = [
'core', 'minilzo', 'discio', 'bdisasm', 'videocommon',
'inputcommon', 'common', 'lua', 'z'
'inputcommon', 'common', 'lua', 'z', 'sfml'
]
if wxenv['HAVE_WX']:
@ -37,6 +37,10 @@ if wxenv['HAVE_WX']:
'stdafx.cpp',
'WxUtils.cpp',
'MemoryCards/WiiSaveCrypted.cpp',
'NetEvent.cpp',
'NetFunctions.cpp',
'NetSockets.cpp',
'NetWindow.cpp',
]
CPPDEFINES = [
@ -46,14 +50,6 @@ if wxenv['HAVE_WX']:
libs = [ 'debwx', 'debugger_ui_util'] + libs
if wxenv['HAVE_SFML']:
files += [
'NetEvent.cpp',
'NetFunctions.cpp',
'NetSockets.cpp',
'NetWindow.cpp',
]
if wxenv['HAVE_COCOA']:
files += [ 'cocoaApp.m', ]
compileFlags = [