From c15b1d3219ced27e736c5c0eccd8d2726bb1c8fd Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Tue, 20 Apr 2010 13:19:36 +0000 Subject: 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 --- Source/Core/InputCommon/Src/SConscript | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'Source/Core/InputCommon/Src/SConscript') 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) - - -- cgit v1.2.3