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

xpad: Change to Unicode project and remove unused headers 

Also remove an unnecessary ASSERT define, and delete the copy
constructors.
This commit is contained in:
Jonathan Li 2016-02-27 00:28:25 +00:00
parent 234bf8af34
commit 6c7cfe9e4d
4 changed files with 10 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/xpad/stdafx.h
View File

@ -37,23 +37,15 @@
#include <commdlg.h> #include <commdlg.h>
#include <shellapi.h> #include <shellapi.h>
#include <xinput.h> #include <xinput.h>
#include <assert.h> #include <assert.h>
// stdc
#include <math.h>
#include <time.h> #include <time.h>
#include <intrin.h>
#include <string>
#include <vector> #include <vector>
#include <list> #include <list>
#include <map>
using namespace std; using namespace std;
extern string format(const char* fmt, ...);
// syntactic sugar // syntactic sugar
// put these into vc9/common7/ide/usertype.dat to have them highlighted // put these into vc9/common7/ide/usertype.dat to have them highlighted
@ -83,12 +75,3 @@ typedef signed long long int64;
#define RESTRICT #define RESTRICT
#endif #endif
#endif #endif
#if defined(_DEBUG) && defined(_MSC_VER)
#define ASSERT assert
#else
#define ASSERT(exp) ((void)0)
#endif

2
plugins/xpad/xpad.cpp
View File

@ -561,7 +561,7 @@ public:
ret = (value == 'B' || value == 'C') ? m_pad->GetId() : 0xf3; ret = (value == 'B' || value == 'C') ? m_pad->GetId() : 0xf3;
break; break;
case 2: case 2:
ASSERT(value == 0); assert(value == 0);
ret = 'Z'; ret = 'Z';
break; break;
default: default:

4
plugins/xpad/xpad.h
View File

@ -78,7 +78,7 @@ struct KeyEvent
class CCritSec class CCritSec
{ {
CCritSec(const CCritSec &refCritSec); CCritSec(const CCritSec &refCritSec);
CCritSec &operator=(const CCritSec &refCritSec); CCritSec &operator=(const CCritSec &refCritSec) = delete;
CRITICAL_SECTION m_CritSec; CRITICAL_SECTION m_CritSec;
@ -93,7 +93,7 @@ public:
class CAutoLock class CAutoLock
{ {
CAutoLock(const CAutoLock &refAutoLock); CAutoLock(const CAutoLock &refAutoLock);
CAutoLock &operator=(const CAutoLock &refAutoLock); CAutoLock &operator=(const CAutoLock &refAutoLock) = delete;
protected: protected:
CCritSec * m_pLock; CCritSec * m_pLock;

12
plugins/xpad/xpad.vcxproj
View File

@ -28,27 +28,27 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc> <UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>$(DefaultPlatformToolset)_xp</PlatformToolset> <PlatformToolset>$(DefaultPlatformToolset)_xp</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc> <UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>Unicode</CharacterSet>
<PlatformToolset>$(DefaultPlatformToolset)_xp</PlatformToolset> <PlatformToolset>$(DefaultPlatformToolset)_xp</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Static</UseOfMfc> <UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>$(DefaultPlatformToolset)_xp</PlatformToolset> <PlatformToolset>$(DefaultPlatformToolset)_xp</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>Static</UseOfMfc> <UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>Unicode</CharacterSet>
<PlatformToolset>$(DefaultPlatformToolset)_xp</PlatformToolset> <PlatformToolset>$(DefaultPlatformToolset)_xp</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />