From a744391aac60a80a6436f995f3f9e0ba1fcd1067 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Thu, 1 Apr 2010 11:49:44 +0000 Subject: [PATCH] Remove GCPadNew from the linux build until I get a chance to fix it. It breaks the linux build now. SDL version 1.3.0, which includes SDL_haptic, is not available for most linux distributions at this time. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5264 8ced0084-cf51-0410-be5f-012b33b47a6e --- SConstruct | 6 +++++- .../Plugin_GCPadNew/Src/ControllerInterface/SDL/SDL.h | 8 ++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/SConstruct b/SConstruct index 027295712a..f3d028c8a3 100644 --- a/SConstruct +++ b/SConstruct @@ -77,12 +77,16 @@ dirs = [ 'Source/Plugins/Plugin_DSP_HLE/Src', 'Source/Plugins/Plugin_DSP_LLE/Src', 'Source/Plugins/Plugin_GCPad/Src', - 'Source/Plugins/Plugin_GCPadNew/Src', 'Source/Plugins/Plugin_Wiimote/Src', 'Source/Core/DolphinWX/Src', 'Source/Core/DebuggerWX/Src', ] +if sys.platform == 'darwin': + dirs += [ + 'Source/Plugins/Plugin_GCPadNew/Src' + ] + builders = {} if sys.platform == 'darwin': from plistlib import writePlist diff --git a/Source/Plugins/Plugin_GCPadNew/Src/ControllerInterface/SDL/SDL.h b/Source/Plugins/Plugin_GCPadNew/Src/ControllerInterface/SDL/SDL.h index 3da477ca23..fdd2b18da6 100644 --- a/Source/Plugins/Plugin_GCPadNew/Src/ControllerInterface/SDL/SDL.h +++ b/Source/Plugins/Plugin_GCPadNew/Src/ControllerInterface/SDL/SDL.h @@ -7,11 +7,11 @@ #undef M_PI // really dum #ifdef _WIN32 - #include - #include + #include + #include #else - #include - #include + #include + #include #endif namespace ciface