mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-23 22:29:39 -06:00
(cleanup) InputPluginCommon is dead. Long live InputCommon and InputUICommon.
I hope I didn't break the mac+linux builds - if i did, fixing it should be a simple matter of adjusting the sconscripts. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5661 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard
@ -47,7 +47,7 @@ include_paths = [
|
|||||||
basedir + 'Externals/WiiUseSrc/Src',
|
basedir + 'Externals/WiiUseSrc/Src',
|
||||||
basedir + 'Source/Core/VideoCommon/Src',
|
basedir + 'Source/Core/VideoCommon/Src',
|
||||||
basedir + 'Source/Core/InputCommon/Src',
|
basedir + 'Source/Core/InputCommon/Src',
|
||||||
basedir + 'Source/Plugins/InputPluginCommon/Src',
|
basedir + 'Source/Plugins/InputUICommon/Src',
|
||||||
basedir + 'Source/Core/AudioCommon/Src',
|
basedir + 'Source/Core/AudioCommon/Src',
|
||||||
basedir + 'Source/Core/DebuggerUICommon/Src',
|
basedir + 'Source/Core/DebuggerUICommon/Src',
|
||||||
basedir + 'Source/Core/DSPCore/Src',
|
basedir + 'Source/Core/DSPCore/Src',
|
||||||
@ -66,7 +66,7 @@ dirs = [
|
|||||||
'Source/Core/DebuggerUICommon/Src',
|
'Source/Core/DebuggerUICommon/Src',
|
||||||
'Source/Core/DSPCore/Src',
|
'Source/Core/DSPCore/Src',
|
||||||
'Source/DSPTool/Src',
|
'Source/DSPTool/Src',
|
||||||
'Source/Plugins/InputPluginCommon/Src/',
|
'Source/Plugins/InputUICommon/Src/',
|
||||||
'Source/Plugins/Plugin_VideoOGL/Src',
|
'Source/Plugins/Plugin_VideoOGL/Src',
|
||||||
'Source/Plugins/Plugin_VideoSoftware/Src',
|
'Source/Plugins/Plugin_VideoSoftware/Src',
|
||||||
'Source/Plugins/Plugin_DSP_HLE/Src',
|
'Source/Plugins/Plugin_DSP_HLE/Src',
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="Windows-1252"?>
|
<?xml version="1.0" encoding="Windows-1252"?>
|
||||||
<VisualStudioProject
|
<VisualStudioProject
|
||||||
ProjectType="Visual C++"
|
ProjectType="Visual C++"
|
||||||
Version="9.00"
|
Version="9,00"
|
||||||
Name="InputCommon"
|
Name="InputCommon"
|
||||||
ProjectGUID="{C7E5D50A-2916-464B-86A7-E10B3CC88ADA}"
|
ProjectGUID="{C7E5D50A-2916-464B-86A7-E10B3CC88ADA}"
|
||||||
RootNamespace="VideoCommon"
|
RootNamespace="VideoCommon"
|
||||||
@ -480,6 +480,14 @@
|
|||||||
RelativePath=".\Src\Configuration.cpp"
|
RelativePath=".\Src\Configuration.cpp"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath=".\Src\ControllerEmu.cpp"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath=".\Src\ControllerEmu.h"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath=".\Src\DirectInputBase.cpp"
|
RelativePath=".\Src\DirectInputBase.cpp"
|
||||||
>
|
>
|
||||||
@ -508,6 +516,14 @@
|
|||||||
RelativePath=".\Src\InputCommon.h"
|
RelativePath=".\Src\InputCommon.h"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath=".\Src\InputConfig.cpp"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath=".\Src\InputConfig.h"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath=".\Src\SDL_Util.cpp"
|
RelativePath=".\Src\SDL_Util.cpp"
|
||||||
>
|
>
|
||||||
|
|||||||
@ -23,10 +23,9 @@
|
|||||||
|
|
||||||
#include "pluginspecs_pad.h"
|
#include "pluginspecs_pad.h"
|
||||||
#include "pluginspecs_wiimote.h"
|
#include "pluginspecs_wiimote.h"
|
||||||
//#include <CommonTypes.h>
|
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
|
|
||||||
#include <ControllerInterface/ControllerInterface.h>
|
#include "ControllerInterface/ControllerInterface.h"
|
||||||
#include "IniFile.h"
|
#include "IniFile.h"
|
||||||
|
|
||||||
#include <vector>
|
#include <vector>
|
||||||
@ -15,8 +15,7 @@
|
|||||||
// Official SVN repository and contact information can be found at
|
// Official SVN repository and contact information can be found at
|
||||||
// http://code.google.com/p/dolphin-emu/
|
// http://code.google.com/p/dolphin-emu/
|
||||||
|
|
||||||
#include "Config.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)
|
||||||
@ -18,11 +18,11 @@
|
|||||||
#ifndef _CONFIG_H_
|
#ifndef _CONFIG_H_
|
||||||
#define _CONFIG_H_
|
#define _CONFIG_H_
|
||||||
|
|
||||||
#include <ControllerInterface/ControllerInterface.h>
|
|
||||||
#include "Thread.h"
|
#include "Thread.h"
|
||||||
#include "FileUtil.h"
|
#include "FileUtil.h"
|
||||||
#include "IniFile.h"
|
#include "IniFile.h"
|
||||||
|
|
||||||
|
#include "ControllerInterface/ControllerInterface.h"
|
||||||
#include "ControllerEmu.h"
|
#include "ControllerEmu.h"
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
@ -4,8 +4,10 @@ Import('env')
|
|||||||
|
|
||||||
files = [
|
files = [
|
||||||
'Configuration.cpp',
|
'Configuration.cpp',
|
||||||
|
'ControllerEmu.cpp',
|
||||||
'EventHandler.cpp',
|
'EventHandler.cpp',
|
||||||
'InputCommon.cpp',
|
'InputCommon.cpp',
|
||||||
|
'InputConfig.cpp',
|
||||||
'SDL_Util.cpp',
|
'SDL_Util.cpp',
|
||||||
'ControllerInterface/ControllerInterface.cpp',
|
'ControllerInterface/ControllerInterface.cpp',
|
||||||
'ControllerInterface/SDL/SDL.cpp'
|
'ControllerInterface/SDL/SDL.cpp'
|
||||||
|
|||||||
@ -1,442 +1,425 @@
|
|||||||
<?xml version="1.0" encoding="Windows-1252"?>
|
<?xml version="1.0" encoding="Windows-1252"?>
|
||||||
<VisualStudioProject
|
<VisualStudioProject
|
||||||
ProjectType="Visual C++"
|
ProjectType="Visual C++"
|
||||||
Version="9,00"
|
Version="9,00"
|
||||||
Name="InputPluginCommon"
|
Name="InputUICommon"
|
||||||
ProjectGUID="{660BB3F7-ED8F-4027-A460-8E4EDA8189BE}"
|
ProjectGUID="{374E2DB7-42DF-4E59-8474-62B6687F4978}"
|
||||||
RootNamespace="VideoCommon"
|
RootNamespace="InputUICommon"
|
||||||
Keyword="Win32Proj"
|
Keyword="Win32Proj"
|
||||||
TargetFrameworkVersion="131072"
|
TargetFrameworkVersion="196613"
|
||||||
>
|
>
|
||||||
<Platforms>
|
<Platforms>
|
||||||
<Platform
|
<Platform
|
||||||
Name="Win32"
|
Name="Win32"
|
||||||
/>
|
/>
|
||||||
<Platform
|
<Platform
|
||||||
Name="x64"
|
Name="x64"
|
||||||
/>
|
/>
|
||||||
</Platforms>
|
</Platforms>
|
||||||
<ToolFiles>
|
<ToolFiles>
|
||||||
</ToolFiles>
|
</ToolFiles>
|
||||||
<Configurations>
|
<Configurations>
|
||||||
<Configuration
|
<Configuration
|
||||||
Name="Debug|Win32"
|
Name="Debug|Win32"
|
||||||
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
|
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
|
||||||
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
|
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
|
||||||
ConfigurationType="4"
|
ConfigurationType="4"
|
||||||
CharacterSet="1"
|
CharacterSet="1"
|
||||||
WholeProgramOptimization="0"
|
>
|
||||||
>
|
<Tool
|
||||||
<Tool
|
Name="VCPreBuildEventTool"
|
||||||
Name="VCPreBuildEventTool"
|
/>
|
||||||
/>
|
<Tool
|
||||||
<Tool
|
Name="VCCustomBuildTool"
|
||||||
Name="VCCustomBuildTool"
|
/>
|
||||||
/>
|
<Tool
|
||||||
<Tool
|
Name="VCXMLDataGeneratorTool"
|
||||||
Name="VCXMLDataGeneratorTool"
|
/>
|
||||||
/>
|
<Tool
|
||||||
<Tool
|
Name="VCWebServiceProxyGeneratorTool"
|
||||||
Name="VCWebServiceProxyGeneratorTool"
|
/>
|
||||||
/>
|
<Tool
|
||||||
<Tool
|
Name="VCMIDLTool"
|
||||||
Name="VCMIDLTool"
|
/>
|
||||||
/>
|
<Tool
|
||||||
<Tool
|
Name="VCCLCompilerTool"
|
||||||
Name="VCCLCompilerTool"
|
Optimization="0"
|
||||||
Optimization="0"
|
AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
|
||||||
AdditionalIncludeDirectories="../../Core/InputCommon/Src;../../Core/Common/Src;../../PluginSpecs;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\wxWidgets\lib\vc_lib\msw;..\..\..\Externals\wxWidgets\include\msvc"
|
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;__WXMSW__;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
|
||||||
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
|
MinimalRebuild="true"
|
||||||
MinimalRebuild="true"
|
BasicRuntimeChecks="3"
|
||||||
BasicRuntimeChecks="3"
|
RuntimeLibrary="1"
|
||||||
RuntimeLibrary="1"
|
UsePrecompiledHeader="0"
|
||||||
BufferSecurityCheck="false"
|
WarningLevel="3"
|
||||||
UsePrecompiledHeader="0"
|
DebugInformationFormat="4"
|
||||||
WarningLevel="3"
|
/>
|
||||||
DebugInformationFormat="4"
|
<Tool
|
||||||
/>
|
Name="VCManagedResourceCompilerTool"
|
||||||
<Tool
|
/>
|
||||||
Name="VCManagedResourceCompilerTool"
|
<Tool
|
||||||
/>
|
Name="VCResourceCompilerTool"
|
||||||
<Tool
|
/>
|
||||||
Name="VCResourceCompilerTool"
|
<Tool
|
||||||
/>
|
Name="VCPreLinkEventTool"
|
||||||
<Tool
|
/>
|
||||||
Name="VCPreLinkEventTool"
|
<Tool
|
||||||
/>
|
Name="VCLibrarianTool"
|
||||||
<Tool
|
/>
|
||||||
Name="VCLibrarianTool"
|
<Tool
|
||||||
/>
|
Name="VCALinkTool"
|
||||||
<Tool
|
/>
|
||||||
Name="VCALinkTool"
|
<Tool
|
||||||
/>
|
Name="VCXDCMakeTool"
|
||||||
<Tool
|
/>
|
||||||
Name="VCXDCMakeTool"
|
<Tool
|
||||||
/>
|
Name="VCBscMakeTool"
|
||||||
<Tool
|
/>
|
||||||
Name="VCBscMakeTool"
|
<Tool
|
||||||
/>
|
Name="VCFxCopTool"
|
||||||
<Tool
|
/>
|
||||||
Name="VCFxCopTool"
|
<Tool
|
||||||
/>
|
Name="VCPostBuildEventTool"
|
||||||
<Tool
|
/>
|
||||||
Name="VCPostBuildEventTool"
|
</Configuration>
|
||||||
/>
|
<Configuration
|
||||||
</Configuration>
|
Name="Debug|x64"
|
||||||
<Configuration
|
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
|
||||||
Name="Debug|x64"
|
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
|
||||||
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
|
ConfigurationType="4"
|
||||||
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
|
CharacterSet="1"
|
||||||
ConfigurationType="4"
|
>
|
||||||
CharacterSet="1"
|
<Tool
|
||||||
WholeProgramOptimization="0"
|
Name="VCPreBuildEventTool"
|
||||||
>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCPreBuildEventTool"
|
Name="VCCustomBuildTool"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCCustomBuildTool"
|
Name="VCXMLDataGeneratorTool"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCXMLDataGeneratorTool"
|
Name="VCWebServiceProxyGeneratorTool"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCWebServiceProxyGeneratorTool"
|
Name="VCMIDLTool"
|
||||||
/>
|
TargetEnvironment="3"
|
||||||
<Tool
|
/>
|
||||||
Name="VCMIDLTool"
|
<Tool
|
||||||
TargetEnvironment="3"
|
Name="VCCLCompilerTool"
|
||||||
/>
|
Optimization="0"
|
||||||
<Tool
|
AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
|
||||||
Name="VCCLCompilerTool"
|
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;__WXMSW__;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
|
||||||
Optimization="0"
|
MinimalRebuild="true"
|
||||||
AdditionalIncludeDirectories="../../Core/InputCommon/Src;../../Core/Common/Src;../../PluginSpecs;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\wxWidgets\lib\vc_lib\msw;..\..\..\Externals\wxWidgets\include\msvc"
|
BasicRuntimeChecks="3"
|
||||||
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_SECURE_SCL=0;_LIB;__WXMSW__;wxUSE_BASE=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
|
RuntimeLibrary="1"
|
||||||
MinimalRebuild="true"
|
UsePrecompiledHeader="0"
|
||||||
BasicRuntimeChecks="3"
|
WarningLevel="3"
|
||||||
RuntimeLibrary="1"
|
DebugInformationFormat="3"
|
||||||
BufferSecurityCheck="false"
|
/>
|
||||||
UsePrecompiledHeader="0"
|
<Tool
|
||||||
WarningLevel="3"
|
Name="VCManagedResourceCompilerTool"
|
||||||
DebugInformationFormat="3"
|
/>
|
||||||
/>
|
<Tool
|
||||||
<Tool
|
Name="VCResourceCompilerTool"
|
||||||
Name="VCManagedResourceCompilerTool"
|
/>
|
||||||
/>
|
<Tool
|
||||||
<Tool
|
Name="VCPreLinkEventTool"
|
||||||
Name="VCResourceCompilerTool"
|
/>
|
||||||
/>
|
<Tool
|
||||||
<Tool
|
Name="VCLibrarianTool"
|
||||||
Name="VCPreLinkEventTool"
|
/>
|
||||||
/>
|
<Tool
|
||||||
<Tool
|
Name="VCALinkTool"
|
||||||
Name="VCLibrarianTool"
|
/>
|
||||||
/>
|
<Tool
|
||||||
<Tool
|
Name="VCXDCMakeTool"
|
||||||
Name="VCALinkTool"
|
/>
|
||||||
/>
|
<Tool
|
||||||
<Tool
|
Name="VCBscMakeTool"
|
||||||
Name="VCXDCMakeTool"
|
/>
|
||||||
/>
|
<Tool
|
||||||
<Tool
|
Name="VCFxCopTool"
|
||||||
Name="VCBscMakeTool"
|
/>
|
||||||
/>
|
<Tool
|
||||||
<Tool
|
Name="VCPostBuildEventTool"
|
||||||
Name="VCFxCopTool"
|
/>
|
||||||
/>
|
</Configuration>
|
||||||
<Tool
|
<Configuration
|
||||||
Name="VCPostBuildEventTool"
|
Name="Release|Win32"
|
||||||
/>
|
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
|
||||||
</Configuration>
|
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
|
||||||
<Configuration
|
ConfigurationType="4"
|
||||||
Name="Release|Win32"
|
CharacterSet="1"
|
||||||
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
|
WholeProgramOptimization="1"
|
||||||
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
|
>
|
||||||
ConfigurationType="4"
|
<Tool
|
||||||
CharacterSet="1"
|
Name="VCPreBuildEventTool"
|
||||||
WholeProgramOptimization="0"
|
/>
|
||||||
>
|
<Tool
|
||||||
<Tool
|
Name="VCCustomBuildTool"
|
||||||
Name="VCPreBuildEventTool"
|
/>
|
||||||
/>
|
<Tool
|
||||||
<Tool
|
Name="VCXMLDataGeneratorTool"
|
||||||
Name="VCCustomBuildTool"
|
/>
|
||||||
/>
|
<Tool
|
||||||
<Tool
|
Name="VCWebServiceProxyGeneratorTool"
|
||||||
Name="VCXMLDataGeneratorTool"
|
/>
|
||||||
/>
|
<Tool
|
||||||
<Tool
|
Name="VCMIDLTool"
|
||||||
Name="VCWebServiceProxyGeneratorTool"
|
/>
|
||||||
/>
|
<Tool
|
||||||
<Tool
|
Name="VCCLCompilerTool"
|
||||||
Name="VCMIDLTool"
|
Optimization="2"
|
||||||
/>
|
EnableIntrinsicFunctions="true"
|
||||||
<Tool
|
AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
|
||||||
Name="VCCLCompilerTool"
|
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__WXMSW__;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
|
||||||
Optimization="2"
|
RuntimeLibrary="0"
|
||||||
EnableIntrinsicFunctions="true"
|
EnableFunctionLevelLinking="true"
|
||||||
AdditionalIncludeDirectories="../../Core/InputCommon/Src;../../Core/Common/Src;../../PluginSpecs;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\wxWidgets\lib\vc_lib\msw;..\..\..\Externals\wxWidgets\include\msvc"
|
UsePrecompiledHeader="0"
|
||||||
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
|
WarningLevel="3"
|
||||||
StringPooling="true"
|
DebugInformationFormat="3"
|
||||||
RuntimeLibrary="0"
|
/>
|
||||||
BufferSecurityCheck="false"
|
<Tool
|
||||||
EnableEnhancedInstructionSet="2"
|
Name="VCManagedResourceCompilerTool"
|
||||||
FloatingPointModel="0"
|
/>
|
||||||
UsePrecompiledHeader="0"
|
<Tool
|
||||||
WarningLevel="3"
|
Name="VCResourceCompilerTool"
|
||||||
DebugInformationFormat="3"
|
/>
|
||||||
/>
|
<Tool
|
||||||
<Tool
|
Name="VCPreLinkEventTool"
|
||||||
Name="VCManagedResourceCompilerTool"
|
/>
|
||||||
/>
|
<Tool
|
||||||
<Tool
|
Name="VCLibrarianTool"
|
||||||
Name="VCResourceCompilerTool"
|
/>
|
||||||
/>
|
<Tool
|
||||||
<Tool
|
Name="VCALinkTool"
|
||||||
Name="VCPreLinkEventTool"
|
/>
|
||||||
/>
|
<Tool
|
||||||
<Tool
|
Name="VCXDCMakeTool"
|
||||||
Name="VCLibrarianTool"
|
/>
|
||||||
/>
|
<Tool
|
||||||
<Tool
|
Name="VCBscMakeTool"
|
||||||
Name="VCALinkTool"
|
/>
|
||||||
/>
|
<Tool
|
||||||
<Tool
|
Name="VCFxCopTool"
|
||||||
Name="VCXDCMakeTool"
|
/>
|
||||||
/>
|
<Tool
|
||||||
<Tool
|
Name="VCPostBuildEventTool"
|
||||||
Name="VCBscMakeTool"
|
/>
|
||||||
/>
|
</Configuration>
|
||||||
<Tool
|
<Configuration
|
||||||
Name="VCFxCopTool"
|
Name="Release|x64"
|
||||||
/>
|
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
|
||||||
<Tool
|
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
|
||||||
Name="VCPostBuildEventTool"
|
ConfigurationType="4"
|
||||||
/>
|
CharacterSet="1"
|
||||||
</Configuration>
|
WholeProgramOptimization="1"
|
||||||
<Configuration
|
>
|
||||||
Name="Release|x64"
|
<Tool
|
||||||
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
|
Name="VCPreBuildEventTool"
|
||||||
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
|
/>
|
||||||
ConfigurationType="4"
|
<Tool
|
||||||
CharacterSet="1"
|
Name="VCCustomBuildTool"
|
||||||
WholeProgramOptimization="0"
|
/>
|
||||||
>
|
<Tool
|
||||||
<Tool
|
Name="VCXMLDataGeneratorTool"
|
||||||
Name="VCPreBuildEventTool"
|
/>
|
||||||
/>
|
<Tool
|
||||||
<Tool
|
Name="VCWebServiceProxyGeneratorTool"
|
||||||
Name="VCCustomBuildTool"
|
/>
|
||||||
/>
|
<Tool
|
||||||
<Tool
|
Name="VCMIDLTool"
|
||||||
Name="VCXMLDataGeneratorTool"
|
TargetEnvironment="3"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCWebServiceProxyGeneratorTool"
|
Name="VCCLCompilerTool"
|
||||||
/>
|
Optimization="2"
|
||||||
<Tool
|
EnableIntrinsicFunctions="true"
|
||||||
Name="VCMIDLTool"
|
AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
|
||||||
TargetEnvironment="3"
|
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__WXMSW__;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
|
||||||
/>
|
RuntimeLibrary="0"
|
||||||
<Tool
|
EnableFunctionLevelLinking="true"
|
||||||
Name="VCCLCompilerTool"
|
UsePrecompiledHeader="0"
|
||||||
Optimization="2"
|
WarningLevel="3"
|
||||||
EnableIntrinsicFunctions="true"
|
DebugInformationFormat="3"
|
||||||
FavorSizeOrSpeed="1"
|
/>
|
||||||
OmitFramePointers="false"
|
<Tool
|
||||||
AdditionalIncludeDirectories="../../Core/InputCommon/Src;../../Core/Common/Src;../../PluginSpecs;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\wxWidgets\lib\vc_lib\msw;..\..\..\Externals\wxWidgets\include\msvc"
|
Name="VCManagedResourceCompilerTool"
|
||||||
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
|
/>
|
||||||
RuntimeLibrary="0"
|
<Tool
|
||||||
BufferSecurityCheck="false"
|
Name="VCResourceCompilerTool"
|
||||||
UsePrecompiledHeader="0"
|
/>
|
||||||
WarningLevel="3"
|
<Tool
|
||||||
DebugInformationFormat="3"
|
Name="VCPreLinkEventTool"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCManagedResourceCompilerTool"
|
Name="VCLibrarianTool"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCResourceCompilerTool"
|
Name="VCALinkTool"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCPreLinkEventTool"
|
Name="VCXDCMakeTool"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCLibrarianTool"
|
Name="VCBscMakeTool"
|
||||||
OutputFile="$(OutDir)\$(ProjectName).lib"
|
/>
|
||||||
/>
|
<Tool
|
||||||
<Tool
|
Name="VCFxCopTool"
|
||||||
Name="VCALinkTool"
|
/>
|
||||||
/>
|
<Tool
|
||||||
<Tool
|
Name="VCPostBuildEventTool"
|
||||||
Name="VCXDCMakeTool"
|
/>
|
||||||
/>
|
</Configuration>
|
||||||
<Tool
|
<Configuration
|
||||||
Name="VCBscMakeTool"
|
Name="DebugFast|Win32"
|
||||||
/>
|
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
|
||||||
<Tool
|
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
|
||||||
Name="VCFxCopTool"
|
ConfigurationType="4"
|
||||||
/>
|
CharacterSet="1"
|
||||||
<Tool
|
WholeProgramOptimization="1"
|
||||||
Name="VCPostBuildEventTool"
|
>
|
||||||
/>
|
<Tool
|
||||||
</Configuration>
|
Name="VCPreBuildEventTool"
|
||||||
<Configuration
|
/>
|
||||||
Name="DebugFast|Win32"
|
<Tool
|
||||||
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
|
Name="VCCustomBuildTool"
|
||||||
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
|
/>
|
||||||
ConfigurationType="4"
|
<Tool
|
||||||
CharacterSet="1"
|
Name="VCXMLDataGeneratorTool"
|
||||||
WholeProgramOptimization="0"
|
/>
|
||||||
>
|
<Tool
|
||||||
<Tool
|
Name="VCWebServiceProxyGeneratorTool"
|
||||||
Name="VCPreBuildEventTool"
|
/>
|
||||||
/>
|
<Tool
|
||||||
<Tool
|
Name="VCMIDLTool"
|
||||||
Name="VCCustomBuildTool"
|
/>
|
||||||
/>
|
<Tool
|
||||||
<Tool
|
Name="VCCLCompilerTool"
|
||||||
Name="VCXMLDataGeneratorTool"
|
Optimization="2"
|
||||||
/>
|
EnableIntrinsicFunctions="true"
|
||||||
<Tool
|
AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
|
||||||
Name="VCWebServiceProxyGeneratorTool"
|
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__WXMSW__;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
|
||||||
/>
|
RuntimeLibrary="0"
|
||||||
<Tool
|
EnableFunctionLevelLinking="true"
|
||||||
Name="VCMIDLTool"
|
UsePrecompiledHeader="0"
|
||||||
/>
|
WarningLevel="3"
|
||||||
<Tool
|
DebugInformationFormat="3"
|
||||||
Name="VCCLCompilerTool"
|
/>
|
||||||
AdditionalIncludeDirectories="../../Core/InputCommon/Src;../../Core/Common/Src;../../PluginSpecs;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\wxWidgets\lib\vc_lib\msw;..\..\..\Externals\wxWidgets\include\msvc"
|
<Tool
|
||||||
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0"
|
Name="VCManagedResourceCompilerTool"
|
||||||
RuntimeLibrary="0"
|
/>
|
||||||
BufferSecurityCheck="false"
|
<Tool
|
||||||
UsePrecompiledHeader="0"
|
Name="VCResourceCompilerTool"
|
||||||
WarningLevel="3"
|
/>
|
||||||
DebugInformationFormat="3"
|
<Tool
|
||||||
/>
|
Name="VCPreLinkEventTool"
|
||||||
<Tool
|
/>
|
||||||
Name="VCManagedResourceCompilerTool"
|
<Tool
|
||||||
/>
|
Name="VCLibrarianTool"
|
||||||
<Tool
|
/>
|
||||||
Name="VCResourceCompilerTool"
|
<Tool
|
||||||
/>
|
Name="VCALinkTool"
|
||||||
<Tool
|
/>
|
||||||
Name="VCPreLinkEventTool"
|
<Tool
|
||||||
/>
|
Name="VCXDCMakeTool"
|
||||||
<Tool
|
/>
|
||||||
Name="VCLibrarianTool"
|
<Tool
|
||||||
/>
|
Name="VCBscMakeTool"
|
||||||
<Tool
|
/>
|
||||||
Name="VCALinkTool"
|
<Tool
|
||||||
/>
|
Name="VCFxCopTool"
|
||||||
<Tool
|
/>
|
||||||
Name="VCXDCMakeTool"
|
<Tool
|
||||||
/>
|
Name="VCPostBuildEventTool"
|
||||||
<Tool
|
/>
|
||||||
Name="VCBscMakeTool"
|
</Configuration>
|
||||||
/>
|
<Configuration
|
||||||
<Tool
|
Name="DebugFast|x64"
|
||||||
Name="VCFxCopTool"
|
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
|
||||||
/>
|
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
|
||||||
<Tool
|
ConfigurationType="4"
|
||||||
Name="VCPostBuildEventTool"
|
CharacterSet="1"
|
||||||
/>
|
WholeProgramOptimization="1"
|
||||||
</Configuration>
|
>
|
||||||
<Configuration
|
<Tool
|
||||||
Name="DebugFast|x64"
|
Name="VCPreBuildEventTool"
|
||||||
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
|
/>
|
||||||
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
|
<Tool
|
||||||
ConfigurationType="4"
|
Name="VCCustomBuildTool"
|
||||||
CharacterSet="1"
|
/>
|
||||||
WholeProgramOptimization="0"
|
<Tool
|
||||||
>
|
Name="VCXMLDataGeneratorTool"
|
||||||
<Tool
|
/>
|
||||||
Name="VCPreBuildEventTool"
|
<Tool
|
||||||
/>
|
Name="VCWebServiceProxyGeneratorTool"
|
||||||
<Tool
|
/>
|
||||||
Name="VCCustomBuildTool"
|
<Tool
|
||||||
/>
|
Name="VCMIDLTool"
|
||||||
<Tool
|
TargetEnvironment="3"
|
||||||
Name="VCXMLDataGeneratorTool"
|
/>
|
||||||
/>
|
<Tool
|
||||||
<Tool
|
Name="VCCLCompilerTool"
|
||||||
Name="VCWebServiceProxyGeneratorTool"
|
Optimization="2"
|
||||||
/>
|
EnableIntrinsicFunctions="true"
|
||||||
<Tool
|
WholeProgramOptimization="false"
|
||||||
Name="VCMIDLTool"
|
AdditionalIncludeDirectories="..\Common\Src;..\Core\Src;..\InputCommon\Src;..\..\PluginSpecs;..\..\..\Externals\Bochs_disasm;..\..\..\Externals\wxWidgets\Include;..\..\..\Externals\wxWidgets\Include\msvc"
|
||||||
TargetEnvironment="3"
|
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;__WXMSW__;_SECURE_SCL=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
|
||||||
/>
|
RuntimeLibrary="0"
|
||||||
<Tool
|
EnableFunctionLevelLinking="true"
|
||||||
Name="VCCLCompilerTool"
|
UsePrecompiledHeader="0"
|
||||||
AdditionalIncludeDirectories="../../Core/InputCommon/Src;../../Core/Common/Src;../../PluginSpecs;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\wxWidgets\lib\vc_lib\msw;..\..\..\Externals\wxWidgets\include\msvc"
|
WarningLevel="3"
|
||||||
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_SECURE_SCL=0;__WXMSW__;wxUSE_BASE=0;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE"
|
DebugInformationFormat="3"
|
||||||
RuntimeLibrary="0"
|
/>
|
||||||
BufferSecurityCheck="false"
|
<Tool
|
||||||
UsePrecompiledHeader="0"
|
Name="VCManagedResourceCompilerTool"
|
||||||
WarningLevel="3"
|
/>
|
||||||
DebugInformationFormat="3"
|
<Tool
|
||||||
/>
|
Name="VCResourceCompilerTool"
|
||||||
<Tool
|
/>
|
||||||
Name="VCManagedResourceCompilerTool"
|
<Tool
|
||||||
/>
|
Name="VCPreLinkEventTool"
|
||||||
<Tool
|
/>
|
||||||
Name="VCResourceCompilerTool"
|
<Tool
|
||||||
/>
|
Name="VCLibrarianTool"
|
||||||
<Tool
|
/>
|
||||||
Name="VCPreLinkEventTool"
|
<Tool
|
||||||
/>
|
Name="VCALinkTool"
|
||||||
<Tool
|
/>
|
||||||
Name="VCLibrarianTool"
|
<Tool
|
||||||
/>
|
Name="VCXDCMakeTool"
|
||||||
<Tool
|
/>
|
||||||
Name="VCALinkTool"
|
<Tool
|
||||||
/>
|
Name="VCBscMakeTool"
|
||||||
<Tool
|
/>
|
||||||
Name="VCXDCMakeTool"
|
<Tool
|
||||||
/>
|
Name="VCFxCopTool"
|
||||||
<Tool
|
/>
|
||||||
Name="VCBscMakeTool"
|
<Tool
|
||||||
/>
|
Name="VCPostBuildEventTool"
|
||||||
<Tool
|
/>
|
||||||
Name="VCFxCopTool"
|
</Configuration>
|
||||||
/>
|
</Configurations>
|
||||||
<Tool
|
<References>
|
||||||
Name="VCPostBuildEventTool"
|
</References>
|
||||||
/>
|
<Files>
|
||||||
</Configuration>
|
<File
|
||||||
</Configurations>
|
RelativePath=".\Src\ConfigDiag.cpp"
|
||||||
<References>
|
>
|
||||||
</References>
|
</File>
|
||||||
<Files>
|
<File
|
||||||
<File
|
RelativePath=".\Src\ConfigDiag.h"
|
||||||
RelativePath=".\Src\Config.cpp"
|
>
|
||||||
>
|
</File>
|
||||||
</File>
|
<File
|
||||||
<File
|
RelativePath=".\Src\ConfigDiagBitmaps.cpp"
|
||||||
RelativePath=".\Src\Config.h"
|
>
|
||||||
>
|
</File>
|
||||||
</File>
|
<File
|
||||||
<File
|
RelativePath=".\Src\SConscript"
|
||||||
RelativePath=".\Src\ConfigDiag.cpp"
|
>
|
||||||
>
|
</File>
|
||||||
</File>
|
</Files>
|
||||||
<File
|
<Globals>
|
||||||
RelativePath=".\Src\ConfigDiag.h"
|
</Globals>
|
||||||
>
|
</VisualStudioProject>
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath=".\Src\ConfigDiagBitmaps.cpp"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath=".\Src\ControllerEmu.cpp"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
|
||||||
RelativePath=".\Src\ControllerEmu.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
</Files>
|
|
||||||
<Globals>
|
|
||||||
</Globals>
|
|
||||||
</VisualStudioProject>
|
|
||||||
@ -39,8 +39,9 @@
|
|||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include <ControllerInterface/ControllerInterface.h>
|
#include "ControllerInterface/ControllerInterface.h"
|
||||||
#include "Config.h"
|
#include "ControllerEmu.h"
|
||||||
|
#include "InputConfig.h"
|
||||||
#include "FileSearch.h"
|
#include "FileSearch.h"
|
||||||
|
|
||||||
class PadSetting
|
class PadSetting
|
||||||
@ -74,7 +75,7 @@ public:
|
|||||||
void UpdateGUI();
|
void UpdateGUI();
|
||||||
void UpdateValue();
|
void UpdateValue();
|
||||||
|
|
||||||
ControlState& value;
|
ControlState& value;
|
||||||
};
|
};
|
||||||
|
|
||||||
class PadSettingCheckBox : public wxCheckBox, public PadSetting
|
class PadSettingCheckBox : public wxCheckBox, public PadSetting
|
||||||
@ -19,7 +19,6 @@
|
|||||||
|
|
||||||
void ConfigDialog::UpdateBitmaps(wxTimerEvent& WXUNUSED(event))
|
void ConfigDialog::UpdateBitmaps(wxTimerEvent& WXUNUSED(event))
|
||||||
{
|
{
|
||||||
|
|
||||||
GamepadPage* const current_page = (GamepadPage*)m_pad_notebook->GetPage( m_pad_notebook->GetSelection() );
|
GamepadPage* const current_page = (GamepadPage*)m_pad_notebook->GetPage( m_pad_notebook->GetSelection() );
|
||||||
|
|
||||||
std::vector< ControlGroupBox* >::iterator g = current_page->control_groups.begin(),
|
std::vector< ControlGroupBox* >::iterator g = current_page->control_groups.begin(),
|
||||||
14
Source/Core/InputUICommon/Src/SConscript
Normal file
14
Source/Core/InputUICommon/Src/SConscript
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
# -*- python -*-
|
||||||
|
|
||||||
|
Import('env')
|
||||||
|
import sys
|
||||||
|
|
||||||
|
if not env['HAVE_WX']:
|
||||||
|
Return()
|
||||||
|
|
||||||
|
files = [
|
||||||
|
'ConfigDiag.cpp',
|
||||||
|
'ConfigDiagBitmaps.cpp',
|
||||||
|
]
|
||||||
|
|
||||||
|
env.StaticLibrary(env['local_libs'] + 'debugger_ui_util', files)
|
||||||
@ -189,8 +189,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_GCPadNew", "Plugins\
|
|||||||
{05C75041-D67D-4903-A362-8395A7B35C75} = {05C75041-D67D-4903-A362-8395A7B35C75}
|
{05C75041-D67D-4903-A362-8395A7B35C75} = {05C75041-D67D-4903-A362-8395A7B35C75}
|
||||||
{11F55366-12EC-4C44-A8CB-1D4E315D61ED} = {11F55366-12EC-4C44-A8CB-1D4E315D61ED}
|
{11F55366-12EC-4C44-A8CB-1D4E315D61ED} = {11F55366-12EC-4C44-A8CB-1D4E315D61ED}
|
||||||
{0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} = {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}
|
{0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} = {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}
|
||||||
|
{374E2DB7-42DF-4E59-8474-62B6687F4978} = {374E2DB7-42DF-4E59-8474-62B6687F4978}
|
||||||
{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}
|
{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}
|
||||||
{660BB3F7-ED8F-4027-A460-8E4EDA8189BE} = {660BB3F7-ED8F-4027-A460-8E4EDA8189BE}
|
|
||||||
{C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9}
|
{C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9}
|
||||||
EndProjectSection
|
EndProjectSection
|
||||||
EndProject
|
EndProject
|
||||||
@ -200,20 +200,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_WiimoteNew", "Plugin
|
|||||||
{05C75041-D67D-4903-A362-8395A7B35C75} = {05C75041-D67D-4903-A362-8395A7B35C75}
|
{05C75041-D67D-4903-A362-8395A7B35C75} = {05C75041-D67D-4903-A362-8395A7B35C75}
|
||||||
{11F55366-12EC-4C44-A8CB-1D4E315D61ED} = {11F55366-12EC-4C44-A8CB-1D4E315D61ED}
|
{11F55366-12EC-4C44-A8CB-1D4E315D61ED} = {11F55366-12EC-4C44-A8CB-1D4E315D61ED}
|
||||||
{0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} = {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}
|
{0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} = {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}
|
||||||
|
{374E2DB7-42DF-4E59-8474-62B6687F4978} = {374E2DB7-42DF-4E59-8474-62B6687F4978}
|
||||||
{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}
|
{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}
|
||||||
{660BB3F7-ED8F-4027-A460-8E4EDA8189BE} = {660BB3F7-ED8F-4027-A460-8E4EDA8189BE}
|
|
||||||
{C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9}
|
{C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9}
|
||||||
EndProjectSection
|
EndProjectSection
|
||||||
EndProject
|
EndProject
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InputPluginCommon", "Plugins\InputPluginCommon\InputPluginCommon.vcproj", "{660BB3F7-ED8F-4027-A460-8E4EDA8189BE}"
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InputUICommon", "Core\InputUICommon\InputUICommon.vcproj", "{374E2DB7-42DF-4E59-8474-62B6687F4978}"
|
||||||
ProjectSection(ProjectDependencies) = postProject
|
|
||||||
{C7E5D50A-2916-464B-86A7-E10B3CC88ADA} = {C7E5D50A-2916-464B-86A7-E10B3CC88ADA}
|
|
||||||
{05C75041-D67D-4903-A362-8395A7B35C75} = {05C75041-D67D-4903-A362-8395A7B35C75}
|
|
||||||
{11F55366-12EC-4C44-A8CB-1D4E315D61ED} = {11F55366-12EC-4C44-A8CB-1D4E315D61ED}
|
|
||||||
{0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} = {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}
|
|
||||||
{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}
|
|
||||||
{C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9}
|
|
||||||
EndProjectSection
|
|
||||||
EndProject
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
@ -587,18 +579,18 @@ Global
|
|||||||
{BB6CE47B-C676-44BB-AE93-2CF59B8C8BD4}.Release|Win32.Build.0 = Release|Win32
|
{BB6CE47B-C676-44BB-AE93-2CF59B8C8BD4}.Release|Win32.Build.0 = Release|Win32
|
||||||
{BB6CE47B-C676-44BB-AE93-2CF59B8C8BD4}.Release|x64.ActiveCfg = Release|x64
|
{BB6CE47B-C676-44BB-AE93-2CF59B8C8BD4}.Release|x64.ActiveCfg = Release|x64
|
||||||
{BB6CE47B-C676-44BB-AE93-2CF59B8C8BD4}.Release|x64.Build.0 = Release|x64
|
{BB6CE47B-C676-44BB-AE93-2CF59B8C8BD4}.Release|x64.Build.0 = Release|x64
|
||||||
{660BB3F7-ED8F-4027-A460-8E4EDA8189BE}.Debug|Win32.ActiveCfg = Debug|Win32
|
{374E2DB7-42DF-4E59-8474-62B6687F4978}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||||
{660BB3F7-ED8F-4027-A460-8E4EDA8189BE}.Debug|Win32.Build.0 = Debug|Win32
|
{374E2DB7-42DF-4E59-8474-62B6687F4978}.Debug|Win32.Build.0 = Debug|Win32
|
||||||
{660BB3F7-ED8F-4027-A460-8E4EDA8189BE}.Debug|x64.ActiveCfg = Debug|x64
|
{374E2DB7-42DF-4E59-8474-62B6687F4978}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
{660BB3F7-ED8F-4027-A460-8E4EDA8189BE}.Debug|x64.Build.0 = Debug|x64
|
{374E2DB7-42DF-4E59-8474-62B6687F4978}.Debug|x64.Build.0 = Debug|x64
|
||||||
{660BB3F7-ED8F-4027-A460-8E4EDA8189BE}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
|
{374E2DB7-42DF-4E59-8474-62B6687F4978}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
|
||||||
{660BB3F7-ED8F-4027-A460-8E4EDA8189BE}.DebugFast|Win32.Build.0 = DebugFast|Win32
|
{374E2DB7-42DF-4E59-8474-62B6687F4978}.DebugFast|Win32.Build.0 = DebugFast|Win32
|
||||||
{660BB3F7-ED8F-4027-A460-8E4EDA8189BE}.DebugFast|x64.ActiveCfg = DebugFast|x64
|
{374E2DB7-42DF-4E59-8474-62B6687F4978}.DebugFast|x64.ActiveCfg = DebugFast|x64
|
||||||
{660BB3F7-ED8F-4027-A460-8E4EDA8189BE}.DebugFast|x64.Build.0 = DebugFast|x64
|
{374E2DB7-42DF-4E59-8474-62B6687F4978}.DebugFast|x64.Build.0 = DebugFast|x64
|
||||||
{660BB3F7-ED8F-4027-A460-8E4EDA8189BE}.Release|Win32.ActiveCfg = Release|Win32
|
{374E2DB7-42DF-4E59-8474-62B6687F4978}.Release|Win32.ActiveCfg = Release|Win32
|
||||||
{660BB3F7-ED8F-4027-A460-8E4EDA8189BE}.Release|Win32.Build.0 = Release|Win32
|
{374E2DB7-42DF-4E59-8474-62B6687F4978}.Release|Win32.Build.0 = Release|Win32
|
||||||
{660BB3F7-ED8F-4027-A460-8E4EDA8189BE}.Release|x64.ActiveCfg = Release|x64
|
{374E2DB7-42DF-4E59-8474-62B6687F4978}.Release|x64.ActiveCfg = Release|x64
|
||||||
{660BB3F7-ED8F-4027-A460-8E4EDA8189BE}.Release|x64.Build.0 = Release|x64
|
{374E2DB7-42DF-4E59-8474-62B6687F4978}.Release|x64.Build.0 = Release|x64
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
|
|||||||
@ -1,19 +0,0 @@
|
|||||||
# -*- python -*-
|
|
||||||
|
|
||||||
Import('env')
|
|
||||||
|
|
||||||
files = [
|
|
||||||
'Config.cpp',
|
|
||||||
'ControllerEmu.cpp',
|
|
||||||
]
|
|
||||||
|
|
||||||
if env['HAVE_WX']:
|
|
||||||
files += [
|
|
||||||
'ConfigDiagBitmaps.cpp',
|
|
||||||
'ConfigDiag.cpp',
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
env_inputpc = env.Clone()
|
|
||||||
env_inputpc.StaticLibrary(env['local_libs'] + "inputplugincommon", files)
|
|
||||||
@ -6,9 +6,9 @@
|
|||||||
#include "WiimoteEmu/WiimoteEmu.h"
|
#include "WiimoteEmu/WiimoteEmu.h"
|
||||||
|
|
||||||
#if defined(HAVE_WX) && HAVE_WX
|
#if defined(HAVE_WX) && HAVE_WX
|
||||||
#include "ConfigDiag.h"
|
#include "../../InputUICommon/Src/ConfigDiag.h"
|
||||||
#endif
|
#endif
|
||||||
#include "../../InputPluginCommon/Src/Config.h"
|
#include "../../InputCommon/Src/InputConfig.h"
|
||||||
|
|
||||||
#if defined(HAVE_X11) && HAVE_X11
|
#if defined(HAVE_X11) && HAVE_X11
|
||||||
#include <X11/Xlib.h>
|
#include <X11/Xlib.h>
|
||||||
|
|||||||
Reference in New Issue
Block a user