From 34cad180e8a2124beb0a795998cda4d45ff8fe4f Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Sun, 4 Jan 2009 21:07:22 +0000 Subject: [PATCH] add inputcommon and padsimpleEvnt to windows build. note: the plugin is disabled atm; it builds but isn't fit for general consumption. Also a bit of dolphin-style cleanup on inputcommon git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1768 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Core/Core.vcproj | 14 +- Source/Core/InputCommon/InputCommon.vcproj | 441 ++++++++++ Source/Core/InputCommon/Src/Event.hpp | 448 +++++----- Source/Core/InputCommon/Src/EventHandler.cpp | 66 +- Source/Core/InputCommon/Src/EventHandler.h | 8 +- Source/Core/InputCommon/Src/InputCommon.cpp | 21 +- Source/Core/InputCommon/Src/InputCommon.h | 7 +- Source/Dolphin.sln | 35 + .../Plugin_PadSimple.vcproj | 832 ------------------ .../Plugin_PadSimpleEvnt.vcproj | 220 +---- .../Plugin_PadSimpleEvnt/Src/PadSimple.h | 2 +- 11 files changed, 788 insertions(+), 1306 deletions(-) create mode 100644 Source/Core/InputCommon/InputCommon.vcproj delete mode 100644 Source/Plugins/Plugin_PadSimpleEvnt/Plugin_PadSimple.vcproj diff --git a/Source/Core/Core/Core.vcproj b/Source/Core/Core/Core.vcproj index 7215007250..d1075b7a21 100644 --- a/Source/Core/Core/Core.vcproj +++ b/Source/Core/Core/Core.vcproj @@ -1,7 +1,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Source/Core/InputCommon/Src/Event.hpp b/Source/Core/InputCommon/Src/Event.hpp index 8da9399739..b7fd5c15aa 100755 --- a/Source/Core/InputCommon/Src/Event.hpp +++ b/Source/Core/InputCommon/Src/Event.hpp @@ -38,112 +38,112 @@ namespace sf //////////////////////////////////////////////////////////// namespace Key { - enum Code - { - A = 'a', - B = 'b', - C = 'c', - D = 'd', - E = 'e', - F = 'f', - G = 'g', - H = 'h', - I = 'i', - J = 'j', - K = 'k', - L = 'l', - M = 'm', - N = 'n', - O = 'o', - P = 'p', - Q = 'q', - R = 'r', - S = 's', - T = 't', - U = 'u', - V = 'v', - W = 'w', - X = 'x', - Y = 'y', - Z = 'z', - Num0 = '0', - Num1 = '1', - Num2 = '2', - Num3 = '3', - Num4 = '4', - Num5 = '5', - Num6 = '6', - Num7 = '7', - Num8 = '8', - Num9 = '9', - Escape = 256, - LControl, - LShift, - LAlt, - LSystem, ///< OS specific key (left side) : windows (Win and Linux), apple (MacOS), ... - RControl, - RShift, - RAlt, - RSystem, ///< OS specific key (right side) : windows (Win and Linux), apple (MacOS), ... - Menu, - LBracket, ///< [ - RBracket, ///< ] - SemiColon, ///< ; - Comma, ///< , - Period, ///< . - Quote, ///< ' - Slash, ///< / - BackSlash, - Tilde, ///< ~ - Equal, ///< = - Dash, ///< - - Space, - Return, - Back, - Tab, - PageUp, - PageDown, - End, - Home, - Insert, - Delete, - Add, ///< + - Subtract, ///< - - Multiply, ///< * - Divide, ///< / - Left, ///< Left arrow - Right, ///< Right arrow - Up, ///< Up arrow - Down, ///< Down arrow - Numpad0, - Numpad1, - Numpad2, - Numpad3, - Numpad4, - Numpad5, - Numpad6, - Numpad7, - Numpad8, - Numpad9, - F1, - F2, - F3, - F4, - F5, - F6, - F7, - F8, - F9, - F10, - F11, - F12, - F13, - F14, - F15, - Pause, + enum Code + { + A = 'a', + B = 'b', + C = 'c', + D = 'd', + E = 'e', + F = 'f', + G = 'g', + H = 'h', + I = 'i', + J = 'j', + K = 'k', + L = 'l', + M = 'm', + N = 'n', + O = 'o', + P = 'p', + Q = 'q', + R = 'r', + S = 's', + T = 't', + U = 'u', + V = 'v', + W = 'w', + X = 'x', + Y = 'y', + Z = 'z', + Num0 = '0', + Num1 = '1', + Num2 = '2', + Num3 = '3', + Num4 = '4', + Num5 = '5', + Num6 = '6', + Num7 = '7', + Num8 = '8', + Num9 = '9', + Escape = 256, + LControl, + LShift, + LAlt, + LSystem, ///< OS specific key (left side) : windows (Win and Linux), apple (MacOS), ... + RControl, + RShift, + RAlt, + RSystem, ///< OS specific key (right side) : windows (Win and Linux), apple (MacOS), ... + Menu, + LBracket, ///< [ + RBracket, ///< ] + SemiColon, ///< ; + Comma, ///< , + Period, ///< . + Quote, ///< ' + Slash, ///< / + BackSlash, + Tilde, ///< ~ + Equal, ///< = + Dash, ///< - + Space, + Return, + Back, + Tab, + PageUp, + PageDown, + End, + Home, + Insert, + Delete, + Add, ///< + + Subtract, ///< - + Multiply, ///< * + Divide, ///< / + Left, ///< Left arrow + Right, ///< Right arrow + Up, ///< Up arrow + Down, ///< Down arrow + Numpad0, + Numpad1, + Numpad2, + Numpad3, + Numpad4, + Numpad5, + Numpad6, + Numpad7, + Numpad8, + Numpad9, + F1, + F2, + F3, + F4, + F5, + F6, + F7, + F8, + F9, + F10, + F11, + F12, + F13, + F14, + F15, + Pause, - Count // For internal use - }; + Count // For internal use + }; } @@ -152,16 +152,16 @@ namespace Key //////////////////////////////////////////////////////////// namespace Mouse { - enum Button - { - Left, - Right, - Middle, - XButton1, - XButton2, + enum Button + { + Left, + Right, + Middle, + XButton1, + XButton2, - Count // For internal use - }; + Count // For internal use + }; } @@ -170,18 +170,18 @@ namespace Mouse //////////////////////////////////////////////////////////// namespace Joy { - enum Axis - { - AxisX, - AxisY, - AxisZ, - AxisR, - AxisU, - AxisV, - AxisPOV, + enum Axis + { + AxisX, + AxisY, + AxisZ, + AxisR, + AxisU, + AxisV, + AxisPOV, - Count // For internal use - }; + Count // For internal use + }; } @@ -192,115 +192,115 @@ class Event { public : - //////////////////////////////////////////////////////////// - /// Keyboard event parameters - //////////////////////////////////////////////////////////// - struct KeyEvent - { - Key::Code Code; - bool Alt; - bool Control; - bool Shift; - }; + //////////////////////////////////////////////////////////// + /// Keyboard event parameters + //////////////////////////////////////////////////////////// + struct KeyEvent + { + Key::Code Code; + bool Alt; + bool Control; + bool Shift; + }; - //////////////////////////////////////////////////////////// - /// Text event parameters - //////////////////////////////////////////////////////////// - struct TextEvent - { - unsigned short Unicode; - }; + //////////////////////////////////////////////////////////// + /// Text event parameters + //////////////////////////////////////////////////////////// + struct TextEvent + { + unsigned short Unicode; + }; - //////////////////////////////////////////////////////////// - /// Mouse move event parameters - //////////////////////////////////////////////////////////// - struct MouseMoveEvent - { - unsigned int X; - unsigned int Y; - }; + //////////////////////////////////////////////////////////// + /// Mouse move event parameters + //////////////////////////////////////////////////////////// + struct MouseMoveEvent + { + unsigned int X; + unsigned int Y; + }; - //////////////////////////////////////////////////////////// - /// Mouse buttons events parameters - //////////////////////////////////////////////////////////// - struct MouseButtonEvent - { - Mouse::Button Button; - }; + //////////////////////////////////////////////////////////// + /// Mouse buttons events parameters + //////////////////////////////////////////////////////////// + struct MouseButtonEvent + { + Mouse::Button Button; + }; - //////////////////////////////////////////////////////////// - /// Mouse wheel events parameters - //////////////////////////////////////////////////////////// - struct MouseWheelEvent - { - int Delta; - }; + //////////////////////////////////////////////////////////// + /// Mouse wheel events parameters + //////////////////////////////////////////////////////////// + struct MouseWheelEvent + { + int Delta; + }; - //////////////////////////////////////////////////////////// - /// Joystick axis move event parameters - //////////////////////////////////////////////////////////// - struct JoyMoveEvent - { - unsigned int JoystickId; - Joy::Axis Axis; - float Position; - }; + //////////////////////////////////////////////////////////// + /// Joystick axis move event parameters + //////////////////////////////////////////////////////////// + struct JoyMoveEvent + { + unsigned int JoystickId; + Joy::Axis Axis; + float Position; + }; - //////////////////////////////////////////////////////////// - /// Joystick buttons events parameters - //////////////////////////////////////////////////////////// - struct JoyButtonEvent - { - unsigned int JoystickId; - unsigned int Button; - }; + //////////////////////////////////////////////////////////// + /// Joystick buttons events parameters + //////////////////////////////////////////////////////////// + struct JoyButtonEvent + { + unsigned int JoystickId; + unsigned int Button; + }; - //////////////////////////////////////////////////////////// - /// Size events parameters - //////////////////////////////////////////////////////////// - struct SizeEvent - { - unsigned int Width; - unsigned int Height; - }; + //////////////////////////////////////////////////////////// + /// Size events parameters + //////////////////////////////////////////////////////////// + struct SizeEvent + { + unsigned int Width; + unsigned int Height; + }; - //////////////////////////////////////////////////////////// - /// Enumeration of the different types of events - //////////////////////////////////////////////////////////// - enum EventType - { - Closed, - Resized, - LostFocus, - GainedFocus, - TextEntered, - KeyPressed, - KeyReleased, - MouseWheelMoved, - MouseButtonPressed, - MouseButtonReleased, - MouseMoved, - JoyButtonPressed, - JoyButtonReleased, - JoyMoved - }; + //////////////////////////////////////////////////////////// + /// Enumeration of the different types of events + //////////////////////////////////////////////////////////// + enum EventType + { + Closed, + Resized, + LostFocus, + GainedFocus, + TextEntered, + KeyPressed, + KeyReleased, + MouseWheelMoved, + MouseButtonPressed, + MouseButtonReleased, + MouseMoved, + JoyButtonPressed, + JoyButtonReleased, + JoyMoved + }; - //////////////////////////////////////////////////////////// - // Member data - //////////////////////////////////////////////////////////// - EventType Type; ///< Type of the event + //////////////////////////////////////////////////////////// + // Member data + //////////////////////////////////////////////////////////// + EventType Type; ///< Type of the event - union - { - KeyEvent Key; - TextEvent Text; - MouseMoveEvent MouseMove; - MouseButtonEvent MouseButton; - MouseWheelEvent MouseWheel; - JoyMoveEvent JoyMove; - JoyButtonEvent JoyButton; - SizeEvent Size; - }; + union + { + KeyEvent Key; + TextEvent Text; + MouseMoveEvent MouseMove; + MouseButtonEvent MouseButton; + MouseWheelEvent MouseWheel; + JoyMoveEvent JoyMove; + JoyButtonEvent JoyButton; + SizeEvent Size; + }; }; } // namespace sf diff --git a/Source/Core/InputCommon/Src/EventHandler.cpp b/Source/Core/InputCommon/Src/EventHandler.cpp index a8770fc153..50bf3715f2 100644 --- a/Source/Core/InputCommon/Src/EventHandler.cpp +++ b/Source/Core/InputCommon/Src/EventHandler.cpp @@ -4,43 +4,54 @@ #include #endif -bool EventHandler::RegisterEventListener(listenFuncPtr func, Keys key) { - if (key.inputType == KeyboardInput) { - if (keys[key.keyCode][key.mods]) - return false; - keys[key.keyCode][key.mods] = func; - } else if (key.inputType == MouseInput) { - if (mouse[key.mouseButton]) - return false; - mouse[key.mouseButton] = func; +bool EventHandler::RegisterEventListener(listenFuncPtr func, Keys key) +{ + if (key.inputType == KeyboardInput) + { + if (keys[key.keyCode][key.mods]) + return false; + keys[key.keyCode][key.mods] = func; } - + else if (key.inputType == MouseInput) + { + if (mouse[key.mouseButton]) + return false; + mouse[key.mouseButton] = func; + } + return true; } -bool EventHandler::RemoveEventListener(Keys key) { - if (key.inputType == KeyboardInput) { - if (! keys[key.keyCode][key.mods]) - return false; - keys[key.keyCode][key.mods] = NULL; - } else if (key.inputType == MouseInput) { - if (! mouse[key.mouseButton]) - return false; - mouse[key.mouseButton] = NULL; +bool EventHandler::RemoveEventListener(Keys key) +{ + if (key.inputType == KeyboardInput) + { + if (! keys[key.keyCode][key.mods]) + return false; + keys[key.keyCode][key.mods] = NULL; } - + else if (key.inputType == MouseInput) + { + if (! mouse[key.mouseButton]) + return false; + mouse[key.mouseButton] = NULL; + } + return true; } -void EventHandler::Update() { - for (unsigned int i = 0; i < eventQueue.size();i++) { - sf::Event ev = eventQueue.front(); - eventQueue.pop(); - keys[ev.Key.Code][ev.Key.Alt+2*ev.Key.Shift+4*ev.Key.Control](ev); +void EventHandler::Update() +{ + for (unsigned int i = 0; i < eventQueue.size();i++) + { + sf::Event ev = eventQueue.front(); + eventQueue.pop(); + keys[ev.Key.Code][ev.Key.Alt+2*ev.Key.Shift+4*ev.Key.Control](ev); } } -bool EventHandler::addEvent(sf::Event *ev) { +bool EventHandler::addEvent(sf::Event *ev) +{ eventQueue.push(*ev); return true; } @@ -151,7 +162,8 @@ sf::Key::Code EventHandler::wxCharCodeToSF(int id) } #endif -void EventHandler::SFKeyToString(sf::Key::Code keycode, char *keyStr) { +void EventHandler::SFKeyToString(sf::Key::Code keycode, char *keyStr) +{ switch (keycode) { /* case sf::Key::A = 'a': sprintf(keyStr, "UP"); break; case sf::Key::B = 'b': sprintf(keyStr, "UP"); break; diff --git a/Source/Core/InputCommon/Src/EventHandler.h b/Source/Core/InputCommon/Src/EventHandler.h index a1f2b2374d..b5a21788d5 100644 --- a/Source/Core/InputCommon/Src/EventHandler.h +++ b/Source/Core/InputCommon/Src/EventHandler.h @@ -12,7 +12,8 @@ enum InputType JoystickInput }; -enum Modifiers { +enum Modifiers +{ UseAlt = 1, UseShift = 2, UseCtrl = 4 @@ -27,13 +28,14 @@ struct Keys sf::Mouse::Button mouseButton; }; -class EventHandler { - +class EventHandler +{ private: listenFuncPtr keys[sf::Key::Count][8]; listenFuncPtr mouse[sf::Mouse::Count]; listenFuncPtr joys[sf::Joy::Count]; std::queue eventQueue; + public: bool RegisterEventListener(listenFuncPtr func, Keys key); bool RemoveEventListener(Keys key); diff --git a/Source/Core/InputCommon/Src/InputCommon.cpp b/Source/Core/InputCommon/Src/InputCommon.cpp index f34ccbb588..9d1c1910d3 100644 --- a/Source/Core/InputCommon/Src/InputCommon.cpp +++ b/Source/Core/InputCommon/Src/InputCommon.cpp @@ -2,16 +2,19 @@ EventHandler *eventHandler = NULL; -namespace InputCommon { - void Init() { +namespace InputCommon +{ + void Init() + { #if defined GLTEST && GLTEST - // init the event handler - eventHandler = new EventHandler(); + // init the event handler + eventHandler = new EventHandler(); #endif - } + } - void Shutdown() { - if (eventHandler) - delete eventHandler; - } + void Shutdown() + { + if (eventHandler) + delete eventHandler; + } } diff --git a/Source/Core/InputCommon/Src/InputCommon.h b/Source/Core/InputCommon/Src/InputCommon.h index 6128e8cf5d..1981c10386 100644 --- a/Source/Core/InputCommon/Src/InputCommon.h +++ b/Source/Core/InputCommon/Src/InputCommon.h @@ -2,7 +2,8 @@ extern EventHandler *eventHandler; -namespace InputCommon { - void Init(); - void Shutdown(); +namespace InputCommon +{ + void Init(); + void Shutdown(); } diff --git a/Source/Dolphin.sln b/Source/Dolphin.sln index 792e513ee2..4096dfd526 100644 --- a/Source/Dolphin.sln +++ b/Source/Dolphin.sln @@ -3,6 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 10.00 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Core", "Core\Core\Core.vcproj", "{F0B874CB-4476-4199-9315-8343D05AE684}" ProjectSection(ProjectDependencies) = postProject {48AD7E0A-25B1-4974-A1E3-03F8C438D34F} = {48AD7E0A-25B1-4974-A1E3-03F8C438D34F} + {C7E5D50A-2916-464B-86A7-E10B3CC88ADA} = {C7E5D50A-2916-464B-86A7-E10B3CC88ADA} {0318BA30-EF48-441A-9E10-DC85EFAE39F0} = {0318BA30-EF48-441A-9E10-DC85EFAE39F0} {71B16F46-0B00-4EDA-B253-D6D9D03A215C} = {71B16F46-0B00-4EDA-B253-D6D9D03A215C} {29C2ABC1-ADA5-42CD-A5FC-96022D52A510} = {29C2ABC1-ADA5-42CD-A5FC-96022D52A510} @@ -131,6 +132,22 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_nJoy_SDL_Test", "Plu EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxAdv28", "..\Externals\wxWidgets\build\msw\wx_adv.vcproj", "{71B16F46-0B00-4EDA-B253-D6D9D03A215C}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InputCommon", "Core\InputCommon\InputCommon.vcproj", "{C7E5D50A-2916-464B-86A7-E10B3CC88ADA}" + ProjectSection(ProjectDependencies) = postProject + {48AD7E0A-25B1-4974-A1E3-03F8C438D34F} = {48AD7E0A-25B1-4974-A1E3-03F8C438D34F} + {0318BA30-EF48-441A-9E10-DC85EFAE39F0} = {0318BA30-EF48-441A-9E10-DC85EFAE39F0} + {71B16F46-0B00-4EDA-B253-D6D9D03A215C} = {71B16F46-0B00-4EDA-B253-D6D9D03A215C} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_PadSimpleEvnt", "Plugins\Plugin_PadSimpleEvnt\Plugin_PadSimpleEvnt.vcproj", "{58E81545-241B-416E-8088-E62452EB25FA}" + ProjectSection(ProjectDependencies) = postProject + {48AD7E0A-25B1-4974-A1E3-03F8C438D34F} = {48AD7E0A-25B1-4974-A1E3-03F8C438D34F} + {C7E5D50A-2916-464B-86A7-E10B3CC88ADA} = {C7E5D50A-2916-464B-86A7-E10B3CC88ADA} + {0318BA30-EF48-441A-9E10-DC85EFAE39F0} = {0318BA30-EF48-441A-9E10-DC85EFAE39F0} + {71B16F46-0B00-4EDA-B253-D6D9D03A215C} = {71B16F46-0B00-4EDA-B253-D6D9D03A215C} + {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -391,6 +408,24 @@ Global {71B16F46-0B00-4EDA-B253-D6D9D03A215C}.Release|Win32.Build.0 = Release|Win32 {71B16F46-0B00-4EDA-B253-D6D9D03A215C}.Release|x64.ActiveCfg = Release|x64 {71B16F46-0B00-4EDA-B253-D6D9D03A215C}.Release|x64.Build.0 = Release|x64 + {C7E5D50A-2916-464B-86A7-E10B3CC88ADA}.Debug|Win32.ActiveCfg = Debug|Win32 + {C7E5D50A-2916-464B-86A7-E10B3CC88ADA}.Debug|Win32.Build.0 = Debug|Win32 + {C7E5D50A-2916-464B-86A7-E10B3CC88ADA}.Debug|x64.ActiveCfg = Debug|x64 + {C7E5D50A-2916-464B-86A7-E10B3CC88ADA}.Debug|x64.Build.0 = Debug|x64 + {C7E5D50A-2916-464B-86A7-E10B3CC88ADA}.DebugFast|Win32.ActiveCfg = DebugFast|Win32 + {C7E5D50A-2916-464B-86A7-E10B3CC88ADA}.DebugFast|Win32.Build.0 = DebugFast|Win32 + {C7E5D50A-2916-464B-86A7-E10B3CC88ADA}.DebugFast|x64.ActiveCfg = DebugFast|x64 + {C7E5D50A-2916-464B-86A7-E10B3CC88ADA}.DebugFast|x64.Build.0 = DebugFast|x64 + {C7E5D50A-2916-464B-86A7-E10B3CC88ADA}.Release|Win32.ActiveCfg = Release|Win32 + {C7E5D50A-2916-464B-86A7-E10B3CC88ADA}.Release|Win32.Build.0 = Release|Win32 + {C7E5D50A-2916-464B-86A7-E10B3CC88ADA}.Release|x64.ActiveCfg = Release|x64 + {C7E5D50A-2916-464B-86A7-E10B3CC88ADA}.Release|x64.Build.0 = Release|x64 + {58E81545-241B-416E-8088-E62452EB25FA}.Debug|Win32.ActiveCfg = Debug|Win32 + {58E81545-241B-416E-8088-E62452EB25FA}.Debug|x64.ActiveCfg = Debug|x64 + {58E81545-241B-416E-8088-E62452EB25FA}.DebugFast|Win32.ActiveCfg = DebugFast|Win32 + {58E81545-241B-416E-8088-E62452EB25FA}.DebugFast|x64.ActiveCfg = DebugFast|x64 + {58E81545-241B-416E-8088-E62452EB25FA}.Release|Win32.ActiveCfg = Release|Win32 + {58E81545-241B-416E-8088-E62452EB25FA}.Release|x64.ActiveCfg = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Source/Plugins/Plugin_PadSimpleEvnt/Plugin_PadSimple.vcproj b/Source/Plugins/Plugin_PadSimpleEvnt/Plugin_PadSimple.vcproj deleted file mode 100644 index 8e3e8453ef..0000000000 --- a/Source/Plugins/Plugin_PadSimpleEvnt/Plugin_PadSimple.vcproj +++ /dev/null @@ -1,832 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Plugins/Plugin_PadSimpleEvnt/Plugin_PadSimpleEvnt.vcproj b/Source/Plugins/Plugin_PadSimpleEvnt/Plugin_PadSimpleEvnt.vcproj index 74a27405ba..45bae0213c 100644 --- a/Source/Plugins/Plugin_PadSimpleEvnt/Plugin_PadSimpleEvnt.vcproj +++ b/Source/Plugins/Plugin_PadSimpleEvnt/Plugin_PadSimpleEvnt.vcproj @@ -2,8 +2,8 @@ @@ -53,7 +53,7 @@ Name="VCCLCompilerTool" Optimization="3" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="../../PluginSpecs;../../Core/Common/Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\wxWidgets\lib\vc_lib\msw;..\..\..\Externals\wxWidgets\include\msvc" + AdditionalIncludeDirectories="../../PluginSpecs;..\..\Core\InputCommon\Src;../../Core/Common/Src;..\..\..\Externals\wxWidgets\include;..\..\..\Externals\wxWidgets\lib\vc_lib\msw;..\..\..\Externals\wxWidgets\include\msvc" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PAD_SIMPLE_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_SECURE_SCL=0" StringPooling="true" RuntimeLibrary="0" @@ -61,7 +61,7 @@ EnableFunctionLevelLinking="true" EnableEnhancedInstructionSet="2" FloatingPointModel="0" - UsePrecompiledHeader="2" + UsePrecompiledHeader="0" PrecompiledHeaderThrough="stdafx.h" PrecompiledHeaderFile="$(IntDir)\$(TargetName).pch" AssemblerListingLocation="$(IntDir)\" @@ -87,7 +87,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Source/Plugins/Plugin_PadSimpleEvnt/Src/PadSimple.h b/Source/Plugins/Plugin_PadSimpleEvnt/Src/PadSimple.h index b65603d8d4..a9d7cc22c1 100644 --- a/Source/Plugins/Plugin_PadSimpleEvnt/Src/PadSimple.h +++ b/Source/Plugins/Plugin_PadSimpleEvnt/Src/PadSimple.h @@ -16,7 +16,7 @@ // http://code.google.com/p/dolphin-emu/ #ifndef __PADSIMPLE_H__ -#define __PADSIMPLE_H__ +#define __PADSIMPLE_H__ #include "InputCommon.h" #define EPAD_CONFIG_FILE "epad.ini"