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

Externals/SFML/src/SConscript

@@ -0,0 +1,22 @@
+# -*- python -*- 
+
+Import('env')
+import sys
+
+files = [ 
+	"SFML/Network/Ftp.cpp",
+	"SFML/Network/Http.cpp",
+	"SFML/Network/IPAddress.cpp",
+	"SFML/Network/Packet.cpp",
+	"SFML/Network/SelectorBase.cpp",
+	"SFML/Network/SocketTCP.cpp",
+	"SFML/Network/SocketUDP.cpp",
+	"SFML/Network/Unix/SocketHelper.cpp",
+	]
+
+env_sfml = env.Clone(
+	CCFLAGS = env.filterWarnings(env['CCFLAGS']),
+	CXXFLAGS = env.filterWarnings(env['CXXFLAGS']),
+	)
+
+env_sfml.StaticLibrary(env['local_libs'] + "sfml", files)

SConstruct

@@ -53,6 +53,7 @@ include_paths = [
     basedir + 'Externals/LZO',
     basedir + 'Externals/SOIL',
     basedir + 'Externals/Lua',
+    basedir + 'Externals/SFML/include',
     basedir + 'Externals/WiiUseSrc/Src',
     basedir + 'Source/Core/VideoCommon/Src',
     basedir + 'Source/Core/InputCommon/Src',
@@ -65,6 +66,7 @@ dirs = [
     'Externals/Bochs_disasm',
     'Externals/LZO',
     'Externals/SOIL',
+    'Externals/SFML/src',
     'Externals/Lua',
     'Externals/WiiUseSrc/Src', 
     'Source/Core/Common/Src',
@@ -322,11 +324,6 @@ if sys.platform != 'darwin':
 # needed for mic
     env['HAVE_PORTAUDIO'] =  conf.CheckPortaudio(1890)
 
-# sfml
-env['HAVE_SFML'] = 0
-if conf.CheckPKG('sfml-network') and conf.CheckCXXHeader("SFML/Network/Ftp.hpp"):
-    env['HAVE_SFML'] = 1;
-
 #osx 64 specifics
 if sys.platform == 'darwin':
     if env['osx'] == '64cocoa':
@@ -378,7 +375,6 @@ conf.Define('USE_WX', env['USE_WX'])
 conf.Define('HAVE_X11', env['HAVE_X11'])
 conf.Define('HAVE_COCOA', env['HAVE_COCOA'])
 conf.Define('HAVE_PORTAUDIO', env['HAVE_PORTAUDIO'])
-conf.Define('HAVE_SFML', env['HAVE_SFML'])
 conf.Define('USER_DIR', "\"" + env['userdir'] + "\"")
 if (ARGUMENTS.get('install') == 'global'):
     conf.Define('DATA_DIR', "\"" + env['data_dir'] + "\"")

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
 

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();
 

Source/Core/Core/Src/SConscript

@@ -137,7 +137,8 @@ else:
 libs = [
 	'bdisasm',
         'inputcommon',
-	'lua'
+	'lua',
+        'sfml'
 	]
 
 env_core = env.Clone();

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
+// CFrame is the main parent window. Inside CFrame there is an m_Panel that is
-// the rendering window (when we render to the main window). In Windows the rendering window is
+// the parent for the rendering window (when we render to the main window). In
-// created by giving CreateWindow() m_Panel->GetHandle() as parent window and creating a new
+// Windows the rendering window is created by giving CreateWindow()
-// child window to m_Panel. The new child window handle that is returned by CreateWindow() can
+// 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)

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"

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"

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 = [