ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Glenn Rice 2010-04-01 11:49:44 +00:00
parent e0b4cbcdae
commit a744391aac
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SConstruct
View File

@ -77,12 +77,16 @@ dirs = [
'Source/Plugins/Plugin_DSP_HLE/Src', 'Source/Plugins/Plugin_DSP_HLE/Src',
'Source/Plugins/Plugin_DSP_LLE/Src', 'Source/Plugins/Plugin_DSP_LLE/Src',
'Source/Plugins/Plugin_GCPad/Src', 'Source/Plugins/Plugin_GCPad/Src',
'Source/Plugins/Plugin_GCPadNew/Src',
'Source/Plugins/Plugin_Wiimote/Src', 'Source/Plugins/Plugin_Wiimote/Src',
'Source/Core/DolphinWX/Src', 'Source/Core/DolphinWX/Src',
'Source/Core/DebuggerWX/Src', 'Source/Core/DebuggerWX/Src',
] ]
if sys.platform == 'darwin':
dirs += [
'Source/Plugins/Plugin_GCPadNew/Src'
]
builders = {} builders = {}
if sys.platform == 'darwin': if sys.platform == 'darwin':
from plistlib import writePlist from plistlib import writePlist

8
Source/Plugins/Plugin_GCPadNew/Src/ControllerInterface/SDL/SDL.h
View File

@ -7,11 +7,11 @@
#undef M_PI #undef M_PI
// really dum // really dum
#ifdef _WIN32 #ifdef _WIN32
#include <sdl.h> #include <SDL.h>
#include <sdl_haptic.h> #include <SDL_haptic.h>
#else #else
#include <SDL/sdl.h> #include <SDL/SDL.h>
#include <SDL/sdl_haptic.h> #include <SDL/SDL_haptic.h>
#endif #endif
namespace ciface namespace ciface