diff options
| author | Soren Jorvang <soren.jorvang@gmail.com> | 2010-06-26 19:17:43 +0000 |
|---|---|---|
| committer | Soren Jorvang <soren.jorvang@gmail.com> | 2010-06-26 19:17:43 +0000 |
| commit | d18085c3adaa3e1724a19bf6f058fda21c7fc3be (patch) | |
| tree | 95098f031147db6865e29d93f8277f5246b62771 /Source/Core/InputCommon/Src/SConscript | |
| parent | 9de9ec1fb69f5e93fc3b7fe30cc16e1032e3a4ae (diff) | |
Don't bother using autoconfiguration to find the OpenCL and Cg
frameworks on OS X.
Try to be a little clearer about which configuration options apply
to which platform(s). Should pave the way slightly for win32 scons.
We have accidentally been using LUA_USE_LINUX on OS X all along.
Turns out that LUA_USE_MACOSX is for an ancient version of OS X and
LUA_USE_LINUX is a reasonable set of defaults for modern Unices, so
just keep using that.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5804 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/InputCommon/Src/SConscript')
| -rw-r--r-- | Source/Core/InputCommon/Src/SConscript | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Source/Core/InputCommon/Src/SConscript b/Source/Core/InputCommon/Src/SConscript index 750045d285..09b580ef4e 100644 --- a/Source/Core/InputCommon/Src/SConscript +++ b/Source/Core/InputCommon/Src/SConscript @@ -11,21 +11,20 @@ files = [ 'ControllerInterface/SDL/SDL.cpp' ] -if env['HAVE_X11']: + +if sys.platform == 'win32': files += [ - "X11InputBase.cpp", ] - -if sys.platform == 'darwin': +elif sys.platform == 'darwin': files += [ 'ControllerInterface/OSX/OSX.mm', 'ControllerInterface/OSX/OSXKeyboard.mm', 'ControllerInterface/OSX/OSXMouse.mm' ] - -if sys.platform == 'linux2': +else: files += [ - 'ControllerInterface/Xlib/Xlib.cpp' + 'ControllerInterface/Xlib/Xlib.cpp', + 'X11InputBase.cpp' ] env.StaticLibrary(env['local_libs'] + "inputcommon", files) |