mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-03 20:54:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

aaand compile fix on windows :p

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5583 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Shawn Hoffman 2010-06-03 06:34:54 +00:00
parent 89aeda83a3
commit 360b8427fd
8 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/Src/HW/GCPad.cpp
View File

@ -1,6 +1,6 @@
#include <ControllerInterface/ControllerInterface.h> #include <ControllerInterface/ControllerInterface.h>
#include "GCPadEmu.h" #include "GCPadEmu.h"
#include <ConfigInput.h> #include <InputConfig.h>
#include "../ConfigManager.h" #include "../ConfigManager.h"
/*staticTODOSHUFFLE*/ Plugin g_GCPad( "GCPad", "Pad", "GCPad" ); /*staticTODOSHUFFLE*/ Plugin g_GCPad( "GCPad", "Pad", "GCPad" );

20
Source/Core/InputCommon/InputCommon.vcproj
View File

@ -504,14 +504,6 @@
> >
</File> </File>
</Filter> </Filter>
<File
RelativePath=".\Src\Config.cpp"
>
</File>
<File
RelativePath=".\Src\Config.h"
>
</File>
<File <File
RelativePath=".\Src\ControllerEmu.cpp" RelativePath=".\Src\ControllerEmu.cpp"
> >
@ -520,6 +512,18 @@
RelativePath=".\Src\ControllerEmu.h" RelativePath=".\Src\ControllerEmu.h"
> >
</File> </File>
<File
RelativePath=".\Src\InputConfig.cpp"
>
</File>
<File
RelativePath=".\Src\InputConfig.h"
>
</File>
<File
RelativePath=".\Src\SConscript"
>
</File>
</Files> </Files>
<Globals> <Globals>
</Globals> </Globals>

2
Source/Core/InputCommon/Src/Config.cpp → Source/Core/InputCommon/Src/InputConfig.cpp
View File

@ -1,5 +1,5 @@
#include "ConfigInput.h" #include "InputConfig.h"
Plugin::Plugin( const char* const _ini_name, const char* const _gui_name, const char* const _profile_name ) Plugin::Plugin( const char* const _ini_name, const char* const _gui_name, const char* const _profile_name )
: ini_name(_ini_name) : ini_name(_ini_name)

0
Source/Core/InputCommon/Src/ConfigInput.h → Source/Core/InputCommon/Src/InputConfig.h
View File

2
Source/Core/InputCommon/Src/SConscript
View File

@ -5,7 +5,7 @@ icenv = env.Clone()
files = [ files = [
'Configuration.cpp', 'Configuration.cpp',
'Config.cpp', 'InputConfig.cpp',
'ControllerEmu.cpp', 'ControllerEmu.cpp',
'SDL_Util.cpp', 'SDL_Util.cpp',
'ControllerInterface/ControllerInterface.cpp', 'ControllerInterface/ControllerInterface.cpp',

16
Source/Plugins/InputUICommon/InputUICommon.vcproj
View File

@ -411,14 +411,14 @@
<Filter <Filter
Name="old" Name="old"
> >
<File <File
RelativePath=".\Src\WXInputBase.cpp" RelativePath=".\Src\WXInputBase.cpp"
> >
</File> </File>
<File <File
RelativePath=".\Src\WXInputBase.h" RelativePath=".\Src\WXInputBase.h"
> >
</File> </File>
</Filter> </Filter>
<File <File
RelativePath=".\Src\ConfigDiag.cpp" RelativePath=".\Src\ConfigDiag.cpp"
@ -432,6 +432,10 @@
RelativePath=".\Src\ConfigDiagBitmaps.cpp" RelativePath=".\Src\ConfigDiagBitmaps.cpp"
> >
</File> </File>
<File
RelativePath=".\Src\SConscript"
>
</File>
</Files> </Files>
<Globals> <Globals>
</Globals> </Globals>

2
Source/Plugins/InputUICommon/Src/ConfigDiag.h
View File

@ -22,7 +22,7 @@
#include <vector> #include <vector>
#include <ControllerInterface/ControllerInterface.h> #include <ControllerInterface/ControllerInterface.h>
#include <ConfigInput.h> #include <InputConfig.h>
#include "FileSearch.h" #include "FileSearch.h"
class PadSetting class PadSetting

2
Source/Plugins/Plugin_WiimoteNew/Src/WiimoteNew.cpp
View File

@ -8,7 +8,7 @@
#if defined(HAVE_WX) && HAVE_WX #if defined(HAVE_WX) && HAVE_WX
#include "ConfigDiag.h" #include "ConfigDiag.h"
#endif #endif
#include <Config.h> #include <InputConfig.h>
#if defined(HAVE_X11) && HAVE_X11 #if defined(HAVE_X11) && HAVE_X11
#include <X11/Xlib.h> #include <X11/Xlib.h>