From 404c625622c4e706dfed9a62b5480ee4d7a33544 Mon Sep 17 00:00:00 2001 From: Soren Jorvang Date: Thu, 10 Jun 2010 14:18:21 +0000 Subject: 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 --- Source/Core/InputCommon/Src/SConscript | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'Source/Core/InputCommon/Src/SConscript') 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) -- cgit v1.2.3