From e7f7eff2b6c93fbe50b2bb389d9a3ad3bffdbf07 Mon Sep 17 00:00:00 2001 From: Soren Jorvang Date: Fri, 11 Jun 2010 08:51:46 +0000 Subject: Remove a few unused HAVE_FOO's and make the SDL check global. ulong is not a standard type. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5649 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/InputCommon/Src/SConscript | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'Source/Core/InputCommon/Src/SConscript') diff --git a/Source/Core/InputCommon/Src/SConscript b/Source/Core/InputCommon/Src/SConscript index d4b340316c..426d877aac 100644 --- a/Source/Core/InputCommon/Src/SConscript +++ b/Source/Core/InputCommon/Src/SConscript @@ -8,6 +8,7 @@ files = [ 'InputCommon.cpp', 'SDL_Util.cpp', 'ControllerInterface/ControllerInterface.cpp', + 'ControllerInterface/SDL/SDL.cpp' ] if env['HAVE_X11']: @@ -20,11 +21,6 @@ if env['HAVE_WX']: "WXInputBase.cpp", ] -if env['HAVE_SDL']: - files += [ - 'ControllerInterface/SDL/SDL.cpp' - ] - if sys.platform == 'darwin': files += [ 'ControllerInterface/OSX/OSX.mm', -- cgit v1.2.3