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

removed HAVE_SFML ifdefs


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5101 8ced0084-cf51-0410-be5f-012b33b47a6e

7 files changed, 12 insertions, 29 deletions

diff --git a/Source/Core/Common/Src/Common.h b/Source/Core/Common/Src/Common.h
index d2e514710f..06ef2809a6 100644
--- a/Source/Core/Common/Src/Common.h
+++ b/Source/Core/Common/Src/Common.h
@@ -83,7 +83,6 @@
 // Since they are always around on windows
 	#define HAVE_WIIUSE 1
 	#define HAVE_WX 1
-	#define HAVE_SFML 1
 	#define HAVE_OPENAL 1
 	#define HAVE_ALSA 0
 
diff --git a/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp b/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp
index 7d67e7053b..c94495c7ef 100644
--- a/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp
+++ b/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp
@@ -131,7 +131,6 @@ bool CSIDevice_GCController::GetData(u32& _Hi, u32& _Low)
 	Common::PluginPAD* pad = CPluginManager::GetInstance().GetPad(0);
 	pad->PAD_GetStatus(ISIDevice::m_iDeviceNumber, &PadStatus);
 
-#if defined(HAVE_SFML) && HAVE_SFML
 	u32 netValues[2] = {0};
 	int NetPlay = GetNetInput(ISIDevice::m_iDeviceNumber, PadStatus, netValues);
 
@@ -145,7 +144,6 @@ bool CSIDevice_GCController::GetData(u32& _Hi, u32& _Low)
 
 		return true;
 	}
-#endif
 
 	Frame::SetPolledDevice();
 
diff --git a/Source/Core/Core/Src/SConscript b/Source/Core/Core/Src/SConscript
index 3087e1b064..5c2c2b2aae 100644
--- a/Source/Core/Core/Src/SConscript
+++ b/Source/Core/Core/Src/SConscript
@@ -137,7 +137,8 @@ else:
 libs = [
 	'bdisasm',
         'inputcommon',
-	'lua'
+	'lua',
+        'sfml'
 	]
 
 env_core = env.Clone();
diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp
index 99b6f7ced8..d81d61c05a 100644
--- a/Source/Core/DolphinWX/Src/Frame.cpp
+++ b/Source/Core/DolphinWX/Src/Frame.cpp
@@ -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)
diff --git a/Source/Core/DolphinWX/Src/FrameAui.cpp b/Source/Core/DolphinWX/Src/FrameAui.cpp
index b362a323e8..1501f776bd 100644
--- a/Source/Core/DolphinWX/Src/FrameAui.cpp
+++ b/Source/Core/DolphinWX/Src/FrameAui.cpp
@@ -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"
diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp
index fb808654fe..8c9c6b7c98 100644
--- a/Source/Core/DolphinWX/Src/FrameTools.cpp
+++ b/Source/Core/DolphinWX/Src/FrameTools.cpp
@@ -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"
diff --git a/Source/Core/DolphinWX/Src/SConscript b/Source/Core/DolphinWX/Src/SConscript
index 52a7aecf1f..6dfeb54bf8 100644
--- a/Source/Core/DolphinWX/Src/SConscript
+++ b/Source/Core/DolphinWX/Src/SConscript
@@ -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 = [