piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -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

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