From ad3bea4c0493f31b0aee5c883584b479cd130f09 Mon Sep 17 00:00:00 2001 From: daco65 Date: Sun, 7 Sep 2008 16:12:56 +0000 Subject: [PATCH] changed keyForControl to an unsigned int. it was in conflict with main.cpp also changed the pre-build events so that it now compiles even when the dolphin source is located in a dir with a space(like C:\documents and settings) git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@465 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Common/Common.vcproj | 12 ++++----- Source/Core/DolphinWX/DolphinWX.vcproj | 26 ++++++++++++++----- .../Plugin_PadSimple/Src/ConfigDlg.cpp | 2 +- 3 files changed, 26 insertions(+), 14 deletions(-) diff --git a/Source/Core/Common/Common.vcproj b/Source/Core/Common/Common.vcproj index b7e40839b2..e8e4545d7f 100644 --- a/Source/Core/Common/Common.vcproj +++ b/Source/Core/Common/Common.vcproj @@ -28,7 +28,7 @@ > + + + + @@ -874,6 +882,10 @@ RelativePath="..\..\..\readme.txt" > + + diff --git a/Source/Plugins/Plugin_PadSimple/Src/ConfigDlg.cpp b/Source/Plugins/Plugin_PadSimple/Src/ConfigDlg.cpp index 74a6ba35ac..3cb7c9498f 100644 --- a/Source/Plugins/Plugin_PadSimple/Src/ConfigDlg.cpp +++ b/Source/Plugins/Plugin_PadSimple/Src/ConfigDlg.cpp @@ -49,7 +49,7 @@ int m_buttonResources[NUMCONTROLS] = // NUMCONTROLS }; -extern int keyForControl[NUMCONTROLS]; +extern unsigned int keyForControl[NUMCONTROLS]; extern bool g_rumbleEnable; LRESULT CConfigDlg::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& /*bHandled*/)