diff options
| author | nakeee <nakeee@gmail.com> | 2010-04-13 06:09:45 +0000 |
|---|---|---|
| committer | nakeee <nakeee@gmail.com> | 2010-04-13 06:09:45 +0000 |
| commit | 379c4693436c9a71e4f88e3428e37ef46a7534c2 (patch) | |
| tree | 9a74b0bcdc82cd6c512f4bddc39d00dde5505917 /Source/Core/InputCommon/Src/SConscript | |
| parent | d8906d2a0ca92b636b2e228da6431621e0cc9479 (diff) | |
Linux compile fix for billard's changes.
(Had to do it myself since glen is now a windows person :P)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5356 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/InputCommon/Src/SConscript')
| -rw-r--r-- | Source/Core/InputCommon/Src/SConscript | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/Source/Core/InputCommon/Src/SConscript b/Source/Core/InputCommon/Src/SConscript index 6d1177c257..acb0b83013 100644 --- a/Source/Core/InputCommon/Src/SConscript +++ b/Source/Core/InputCommon/Src/SConscript @@ -1,12 +1,14 @@ # -*- python -*- - +import sys Import('env') +icenv = env.Clone() files = [ 'Configuration.cpp', 'EventHandler.cpp', 'InputCommon.cpp', 'SDL_Util.cpp', + 'ControllerInterface/ControllerInterface.cpp', ] if env['HAVE_X11']: @@ -19,6 +21,16 @@ if env['HAVE_WX']: "WXInputBase.cpp", ] -env_inputcommon = env.Clone() -env_inputcommon.Append(CXXFLAGS = [ '-fPIC' ]) -env_inputcommon.StaticLibrary(env['local_libs'] + "inputcommon", files) +if icenv['HAVE_SDL']: + files += [ 'ControllerInterface/SDL/SDL.cpp' ] +if sys.platform == 'darwin': + files += [ 'ControllerInterface/OSX/OSX.cpp', + 'ControllerInterface/OSX/OSXPrivate.mm' ] +if sys.platform == 'linux2': + files += [ 'ControllerInterface/Xlib/Xlib.cpp' ] + + +icenv.Append(CXXFLAGS = [ '-fPIC' ]) +icenv.StaticLibrary(env['local_libs'] + "inputcommon", files) + + |