diff options
| author | Soren Jorvang <soren.jorvang@gmail.com> | 2010-06-10 14:18:21 +0000 |
|---|---|---|
| committer | Soren Jorvang <soren.jorvang@gmail.com> | 2010-06-10 14:18:21 +0000 |
| commit | 404c625622c4e706dfed9a62b5480ee4d7a33544 (patch) | |
| tree | 8aa0176d969ac4de775b1aa4f09c28e98e144f0f /Source/Core/InputCommon/Src/SConscript | |
| parent | de45e015cdecd94a601573d37afbdf5b6f19efa9 (diff) | |
Simplify the SCons build:
On OS X, build all code as Objective-C(++).
Centralize framework handling.
Cleanup.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5645 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/InputCommon/Src/SConscript')
| -rw-r--r-- | Source/Core/InputCommon/Src/SConscript | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/Core/InputCommon/Src/SConscript b/Source/Core/InputCommon/Src/SConscript index d80a43f3c3..d4b340316c 100644 --- a/Source/Core/InputCommon/Src/SConscript +++ b/Source/Core/InputCommon/Src/SConscript @@ -1,7 +1,6 @@ # -*- python -*- import sys Import('env') -icenv = env.Clone() files = [ 'Configuration.cpp', @@ -21,7 +20,7 @@ if env['HAVE_WX']: "WXInputBase.cpp", ] -if icenv['HAVE_SDL']: +if env['HAVE_SDL']: files += [ 'ControllerInterface/SDL/SDL.cpp' ] @@ -32,11 +31,10 @@ if sys.platform == 'darwin': 'ControllerInterface/OSX/OSXKeyboard.mm', 'ControllerInterface/OSX/OSXMouse.mm' ] - icenv['FRAMEWORKS'] = ['IOKit'] if sys.platform == 'linux2': files += [ 'ControllerInterface/Xlib/Xlib.cpp' ] -icenv.StaticLibrary(env['local_libs'] + "inputcommon", files) +env.StaticLibrary(env['local_libs'] + "inputcommon", files) |