diff options
| author | Shawn Hoffman <godisgovernment@gmail.com> | 2010-04-20 13:19:36 +0000 |
|---|---|---|
| committer | Shawn Hoffman <godisgovernment@gmail.com> | 2010-04-20 13:19:36 +0000 |
| commit | c15b1d3219ced27e736c5c0eccd8d2726bb1c8fd (patch) | |
| tree | f4139708beb0c92aa1587425514f051409d43728 /Source/Core/InputCommon/Src/SConscript | |
| parent | 026450006afc6b76d5bd6bc49493ecf4532bfe90 (diff) | |
OS X: enable path in Jit64::stX. fix wxw assert on opening ConfigMain. __force_align_arg_pointer__ not needed on x64 builds
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5393 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/InputCommon/Src/SConscript')
| -rw-r--r-- | Source/Core/InputCommon/Src/SConscript | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/Source/Core/InputCommon/Src/SConscript b/Source/Core/InputCommon/Src/SConscript index acb0b83013..a8f5162449 100644 --- a/Source/Core/InputCommon/Src/SConscript +++ b/Source/Core/InputCommon/Src/SConscript @@ -22,15 +22,20 @@ if env['HAVE_WX']: ] if icenv['HAVE_SDL']: - files += [ 'ControllerInterface/SDL/SDL.cpp' ] + files += [ + 'ControllerInterface/SDL/SDL.cpp' + ] + if sys.platform == 'darwin': - files += [ 'ControllerInterface/OSX/OSX.cpp', - 'ControllerInterface/OSX/OSXPrivate.mm' ] + files += [ + 'ControllerInterface/OSX/OSX.cpp', + 'ControllerInterface/OSX/OSXPrivate.mm' + ] + if sys.platform == 'linux2': - files += [ 'ControllerInterface/Xlib/Xlib.cpp' ] - + files += [ + 'ControllerInterface/Xlib/Xlib.cpp' + ] icenv.Append(CXXFLAGS = [ '-fPIC' ]) icenv.StaticLibrary(env['local_libs'] + "inputcommon", files) - - |