Merge pull request #8807 from garbear/controller-input

Controller input

1 files changed, 344 insertions, 8 deletions

diff --git a/Kodi.xcodeproj/project.pbxproj b/Kodi.xcodeproj/project.pbxproj
index a41158ec47..27c7b488ca 100644
--- a/Kodi.xcodeproj/project.pbxproj
+++ b/Kodi.xcodeproj/project.pbxproj
@@ -113,7 +113,6 @@
 		18B7C8D712942546009E7A26 /* ButtonTranslator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C8CB12942546009E7A26 /* ButtonTranslator.cpp */; };
 		18B7C8D912942546009E7A26 /* KeyboardStat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C8CF12942546009E7A26 /* KeyboardStat.cpp */; };
 		18B7C8DA12942546009E7A26 /* MouseStat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C8D112942546009E7A26 /* MouseStat.cpp */; };
-		18B7C8DB12942546009E7A26 /* SDLJoystick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C8D312942546009E7A26 /* SDLJoystick.cpp */; };
 		18B7C8E912942603009E7A26 /* Crc32.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C8E712942603009E7A26 /* Crc32.cpp */; };
 		18B7C8EE12942613009E7A26 /* URIUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C8EC12942613009E7A26 /* URIUtils.cpp */; };
 		18B7C8F31294261F009E7A26 /* StringUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C8F11294261F009E7A26 /* StringUtils.cpp */; };
@@ -254,6 +253,68 @@
 		5EB3113C1A978B9B00551907 /* CueInfoLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5EB3113A1A978B9B00551907 /* CueInfoLoader.cpp */; };
 		5EE4F9181A9FF36F002E20F8 /* CueInfoLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5EB3113A1A978B9B00551907 /* CueInfoLoader.cpp */; };
 		5EF801001A97892A0035AA4D /* ReplayGain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5EF800FE1A97892A0035AA4D /* ReplayGain.cpp */; };
+		68AE5BA51C92412900C4D527 /* AddonCallbacksPeripheral.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BA31C92412900C4D527 /* AddonCallbacksPeripheral.cpp */; };
+		68AE5BA61C92412900C4D527 /* AddonCallbacksPeripheral.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BA31C92412900C4D527 /* AddonCallbacksPeripheral.cpp */; };
+		68AE5BBD1C9241DF00C4D527 /* DefaultJoystick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BAC1C9241DF00C4D527 /* DefaultJoystick.cpp */; };
+		68AE5BBE1C9241DF00C4D527 /* DefaultJoystick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BAC1C9241DF00C4D527 /* DefaultJoystick.cpp */; };
+		68AE5BBF1C9241DF00C4D527 /* DriverPrimitive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BAE1C9241DF00C4D527 /* DriverPrimitive.cpp */; };
+		68AE5BC01C9241DF00C4D527 /* DriverPrimitive.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BAE1C9241DF00C4D527 /* DriverPrimitive.cpp */; };
+		68AE5BC11C9241DF00C4D527 /* JoystickMonitor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BB51C9241DF00C4D527 /* JoystickMonitor.cpp */; };
+		68AE5BC21C9241DF00C4D527 /* JoystickMonitor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BB51C9241DF00C4D527 /* JoystickMonitor.cpp */; };
+		68AE5BC31C9241DF00C4D527 /* JoystickTranslator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BB71C9241DF00C4D527 /* JoystickTranslator.cpp */; };
+		68AE5BC41C9241DF00C4D527 /* JoystickTranslator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BB71C9241DF00C4D527 /* JoystickTranslator.cpp */; };
+		68AE5BC51C9241DF00C4D527 /* KeymapHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BBB1C9241DF00C4D527 /* KeymapHandler.cpp */; };
+		68AE5BC61C9241DF00C4D527 /* KeymapHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BBB1C9241DF00C4D527 /* KeymapHandler.cpp */; };
+		68AE5BCE1C9241F800C4D527 /* ButtonMapping.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BC81C9241F800C4D527 /* ButtonMapping.cpp */; };
+		68AE5BCF1C9241F800C4D527 /* ButtonMapping.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BC81C9241F800C4D527 /* ButtonMapping.cpp */; };
+		68AE5BD01C9241F800C4D527 /* FeatureHandling.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BCA1C9241F800C4D527 /* FeatureHandling.cpp */; };
+		68AE5BD11C9241F800C4D527 /* FeatureHandling.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BCA1C9241F800C4D527 /* FeatureHandling.cpp */; };
+		68AE5BD21C9241F800C4D527 /* InputHandling.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BCC1C9241F800C4D527 /* InputHandling.cpp */; };
+		68AE5BD31C9241F800C4D527 /* InputHandling.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BCC1C9241F800C4D527 /* InputHandling.cpp */; };
+		68AE5BDF1C92421800C4D527 /* AddonButtonMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BD51C92421800C4D527 /* AddonButtonMap.cpp */; };
+		68AE5BE01C92421800C4D527 /* AddonButtonMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BD51C92421800C4D527 /* AddonButtonMap.cpp */; };
+		68AE5BE11C92421800C4D527 /* AddonButtonMapping.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BD71C92421800C4D527 /* AddonButtonMapping.cpp */; };
+		68AE5BE21C92421800C4D527 /* AddonButtonMapping.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BD71C92421800C4D527 /* AddonButtonMapping.cpp */; };
+		68AE5BE31C92421800C4D527 /* AddonInputHandling.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BD91C92421800C4D527 /* AddonInputHandling.cpp */; };
+		68AE5BE41C92421800C4D527 /* AddonInputHandling.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BD91C92421800C4D527 /* AddonInputHandling.cpp */; };
+		68AE5BE51C92421800C4D527 /* PeripheralAddon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BDB1C92421800C4D527 /* PeripheralAddon.cpp */; };
+		68AE5BE61C92421800C4D527 /* PeripheralAddon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BDB1C92421800C4D527 /* PeripheralAddon.cpp */; };
+		68AE5BE71C92421800C4D527 /* PeripheralAddonTranslator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BDD1C92421800C4D527 /* PeripheralAddonTranslator.cpp */; };
+		68AE5BE81C92421800C4D527 /* PeripheralAddonTranslator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BDD1C92421800C4D527 /* PeripheralAddonTranslator.cpp */; };
+		68AE5BEB1C92422C00C4D527 /* PeripheralBusAddon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BE91C92422C00C4D527 /* PeripheralBusAddon.cpp */; };
+		68AE5BEC1C92422C00C4D527 /* PeripheralBusAddon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BE91C92422C00C4D527 /* PeripheralBusAddon.cpp */; };
+		68AE5BEF1C92424300C4D527 /* PeripheralJoystick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BED1C92424300C4D527 /* PeripheralJoystick.cpp */; };
+		68AE5BF01C92424400C4D527 /* PeripheralJoystick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BED1C92424300C4D527 /* PeripheralJoystick.cpp */; };
+		68AE5BF51C92431300C4D527 /* EventScanner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BF11C92431300C4D527 /* EventScanner.cpp */; };
+		68AE5BF61C92431300C4D527 /* EventScanner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BF11C92431300C4D527 /* EventScanner.cpp */; };
+		68AE5BF71C92431300C4D527 /* EventScanRate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BF31C92431300C4D527 /* EventScanRate.cpp */; };
+		68AE5BF81C92431300C4D527 /* EventScanRate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BF31C92431300C4D527 /* EventScanRate.cpp */; };
+		68AE5C071C92437900C4D527 /* GUIConfigurationWizard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BFD1C92437900C4D527 /* GUIConfigurationWizard.cpp */; };
+		68AE5C081C92437900C4D527 /* GUIConfigurationWizard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5BFD1C92437900C4D527 /* GUIConfigurationWizard.cpp */; };
+		68AE5C091C92437900C4D527 /* GUIControllerList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5C001C92437900C4D527 /* GUIControllerList.cpp */; };
+		68AE5C0A1C92437900C4D527 /* GUIControllerList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5C001C92437900C4D527 /* GUIControllerList.cpp */; };
+		68AE5C0B1C92437900C4D527 /* GUIControllerWindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5C021C92437900C4D527 /* GUIControllerWindow.cpp */; };
+		68AE5C0C1C92437900C4D527 /* GUIControllerWindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5C021C92437900C4D527 /* GUIControllerWindow.cpp */; };
+		68AE5C0D1C92437900C4D527 /* GUIFeatureList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5C041C92437900C4D527 /* GUIFeatureList.cpp */; };
+		68AE5C0E1C92437900C4D527 /* GUIFeatureList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5C041C92437900C4D527 /* GUIFeatureList.cpp */; };
+		68AE5C191C92438E00C4D527 /* GUIAnalogStickButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5C0F1C92438E00C4D527 /* GUIAnalogStickButton.cpp */; };
+		68AE5C1A1C92438E00C4D527 /* GUIAnalogStickButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5C0F1C92438E00C4D527 /* GUIAnalogStickButton.cpp */; };
+		68AE5C1B1C92438E00C4D527 /* GUIControllerButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5C111C92438E00C4D527 /* GUIControllerButton.cpp */; };
+		68AE5C1C1C92438E00C4D527 /* GUIControllerButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5C111C92438E00C4D527 /* GUIControllerButton.cpp */; };
+		68AE5C1D1C92438E00C4D527 /* GUIFeatureButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5C131C92438E00C4D527 /* GUIFeatureButton.cpp */; };
+		68AE5C1E1C92438E00C4D527 /* GUIFeatureButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5C131C92438E00C4D527 /* GUIFeatureButton.cpp */; };
+		68AE5C1F1C92438E00C4D527 /* GUIGameController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5C151C92438E00C4D527 /* GUIGameController.cpp */; };
+		68AE5C201C92438E00C4D527 /* GUIGameController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5C151C92438E00C4D527 /* GUIGameController.cpp */; };
+		68AE5C211C92438E00C4D527 /* GUIScalarFeatureButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5C171C92438E00C4D527 /* GUIScalarFeatureButton.cpp */; };
+		68AE5C221C92438E00C4D527 /* GUIScalarFeatureButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5C171C92438E00C4D527 /* GUIScalarFeatureButton.cpp */; };
+		68AE5C2D1C9243A000C4D527 /* Controller.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5C231C9243A000C4D527 /* Controller.cpp */; };
+		68AE5C2E1C9243A000C4D527 /* Controller.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5C231C9243A000C4D527 /* Controller.cpp */; };
+		68AE5C2F1C9243A000C4D527 /* ControllerFeature.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5C261C9243A000C4D527 /* ControllerFeature.cpp */; };
+		68AE5C301C9243A000C4D527 /* ControllerFeature.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5C261C9243A000C4D527 /* ControllerFeature.cpp */; };
+		68AE5C311C9243A000C4D527 /* ControllerLayout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5C281C9243A000C4D527 /* ControllerLayout.cpp */; };
+		68AE5C321C9243A000C4D527 /* ControllerLayout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5C281C9243A000C4D527 /* ControllerLayout.cpp */; };
+		68AE5C331C9243A000C4D527 /* ControllerTranslator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5C2A1C9243A000C4D527 /* ControllerTranslator.cpp */; };
+		68AE5C341C9243A000C4D527 /* ControllerTranslator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 68AE5C2A1C9243A000C4D527 /* ControllerTranslator.cpp */; };
 		761170901C8B85F8006C6366 /* AddonGUIRenderingControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7611708C1C8B85F8006C6366 /* AddonGUIRenderingControl.cpp */; };
 		761170911C8B85F8006C6366 /* AddonGUIWindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7611708E1C8B85F8006C6366 /* AddonGUIWindow.cpp */; };
 		76AEFB361C8F79BD00EF2EC0 /* AddonInterfaces.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EDED2E991C878F61000F5E80 /* AddonInterfaces.cpp */; };
@@ -2078,7 +2139,6 @@
 		E499156A174E65AB00741B6D /* ButtonTranslator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C8CB12942546009E7A26 /* ButtonTranslator.cpp */; };
 		E499156B174E65AB00741B6D /* InertialScrollingHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFAB049613F8376700B70BFB /* InertialScrollingHandler.cpp */; };
 		E499156D174E65AB00741B6D /* KeyboardStat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C8CF12942546009E7A26 /* KeyboardStat.cpp */; };
-		E499156E174E65AB00741B6D /* SDLJoystick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C8D312942546009E7A26 /* SDLJoystick.cpp */; };
 		E499156F174E65AC00741B6D /* XBMC_keytable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C8EC5D0C1369519D00CCC10D /* XBMC_keytable.cpp */; };
 		E4991574174E661400741B6D /* WinEventsIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = E4991571174E661300741B6D /* WinEventsIOS.mm */; };
 		E4991575174E661400741B6D /* WinSystemIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = E4991573174E661300741B6D /* WinSystemIOS.mm */; };
@@ -2461,8 +2521,6 @@
 		18B7C8D012942546009E7A26 /* KeyboardStat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KeyboardStat.h; sourceTree = "<group>"; };
 		18B7C8D112942546009E7A26 /* MouseStat.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MouseStat.cpp; sourceTree = "<group>"; };
 		18B7C8D212942546009E7A26 /* MouseStat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MouseStat.h; sourceTree = "<group>"; };
-		18B7C8D312942546009E7A26 /* SDLJoystick.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SDLJoystick.cpp; sourceTree = "<group>"; };
-		18B7C8D412942546009E7A26 /* SDLJoystick.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLJoystick.h; sourceTree = "<group>"; };
 		18B7C8D512942546009E7A26 /* XBMC_keyboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBMC_keyboard.h; sourceTree = "<group>"; };
 		18B7C8D612942546009E7A26 /* XBMC_mouse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBMC_mouse.h; sourceTree = "<group>"; };
 		18B7C8E712942603009E7A26 /* Crc32.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Crc32.cpp; sourceTree = "<group>"; };
@@ -2672,6 +2730,84 @@
 		5EB3113B1A978B9B00551907 /* CueInfoLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CueInfoLoader.h; sourceTree = "<group>"; };
 		5EF800FE1A97892A0035AA4D /* ReplayGain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ReplayGain.cpp; sourceTree = "<group>"; };
 		5EF800FF1A97892A0035AA4D /* ReplayGain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReplayGain.h; sourceTree = "<group>"; };
+		68AE5BA01C923E5300C4D527 /* kodi_vfs_utils.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = kodi_vfs_utils.hpp; path = "kodi-addon-dev-kit/include/kodi/kodi_vfs_utils.hpp"; sourceTree = "<group>"; };
+		68AE5BA31C92412900C4D527 /* AddonCallbacksPeripheral.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AddonCallbacksPeripheral.cpp; path = addons/binary/interfaces/api1/Peripheral/AddonCallbacksPeripheral.cpp; sourceTree = "<group>"; };
+		68AE5BA41C92412900C4D527 /* AddonCallbacksPeripheral.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AddonCallbacksPeripheral.h; path = addons/binary/interfaces/api1/Peripheral/AddonCallbacksPeripheral.h; sourceTree = "<group>"; };
+		68AE5BA71C92414B00C4D527 /* kodi_peripheral_callbacks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = kodi_peripheral_callbacks.h; path = "kodi-addon-dev-kit/include/kodi/kodi_peripheral_callbacks.h"; sourceTree = "<group>"; };
+		68AE5BA81C92414B00C4D527 /* kodi_peripheral_dll.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = kodi_peripheral_dll.h; path = "kodi-addon-dev-kit/include/kodi/kodi_peripheral_dll.h"; sourceTree = "<group>"; };
+		68AE5BA91C92414B00C4D527 /* kodi_peripheral_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = kodi_peripheral_types.h; path = "kodi-addon-dev-kit/include/kodi/kodi_peripheral_types.h"; sourceTree = "<group>"; };
+		68AE5BAA1C92414B00C4D527 /* kodi_peripheral_utils.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = kodi_peripheral_utils.hpp; path = "kodi-addon-dev-kit/include/kodi/kodi_peripheral_utils.hpp"; sourceTree = "<group>"; };
+		68AE5BAC1C9241DF00C4D527 /* DefaultJoystick.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DefaultJoystick.cpp; path = joysticks/DefaultJoystick.cpp; sourceTree = "<group>"; };
+		68AE5BAD1C9241DF00C4D527 /* DefaultJoystick.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DefaultJoystick.h; path = joysticks/DefaultJoystick.h; sourceTree = "<group>"; };
+		68AE5BAE1C9241DF00C4D527 /* DriverPrimitive.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DriverPrimitive.cpp; path = joysticks/DriverPrimitive.cpp; sourceTree = "<group>"; };
+		68AE5BAF1C9241DF00C4D527 /* DriverPrimitive.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DriverPrimitive.h; path = joysticks/DriverPrimitive.h; sourceTree = "<group>"; };
+		68AE5BB01C9241DF00C4D527 /* IButtonMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IButtonMap.h; path = joysticks/IButtonMap.h; sourceTree = "<group>"; };
+		68AE5BB11C9241DF00C4D527 /* IButtonMapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IButtonMapper.h; path = joysticks/IButtonMapper.h; sourceTree = "<group>"; };
+		68AE5BB21C9241DF00C4D527 /* IDriverHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IDriverHandler.h; path = joysticks/IDriverHandler.h; sourceTree = "<group>"; };
+		68AE5BB31C9241DF00C4D527 /* IInputHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IInputHandler.h; path = joysticks/IInputHandler.h; sourceTree = "<group>"; };
+		68AE5BB41C9241DF00C4D527 /* IKeymapHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IKeymapHandler.h; path = joysticks/IKeymapHandler.h; sourceTree = "<group>"; };
+		68AE5BB51C9241DF00C4D527 /* JoystickMonitor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JoystickMonitor.cpp; path = joysticks/JoystickMonitor.cpp; sourceTree = "<group>"; };
+		68AE5BB61C9241DF00C4D527 /* JoystickMonitor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JoystickMonitor.h; path = joysticks/JoystickMonitor.h; sourceTree = "<group>"; };
+		68AE5BB71C9241DF00C4D527 /* JoystickTranslator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = JoystickTranslator.cpp; path = joysticks/JoystickTranslator.cpp; sourceTree = "<group>"; };
+		68AE5BB81C9241DF00C4D527 /* JoystickTranslator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JoystickTranslator.h; path = joysticks/JoystickTranslator.h; sourceTree = "<group>"; };
+		68AE5BB91C9241DF00C4D527 /* JoystickTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JoystickTypes.h; path = joysticks/JoystickTypes.h; sourceTree = "<group>"; };
+		68AE5BBA1C9241DF00C4D527 /* JoystickUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JoystickUtils.h; path = joysticks/JoystickUtils.h; sourceTree = "<group>"; };
+		68AE5BBB1C9241DF00C4D527 /* KeymapHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = KeymapHandler.cpp; path = joysticks/KeymapHandler.cpp; sourceTree = "<group>"; };
+		68AE5BBC1C9241DF00C4D527 /* KeymapHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KeymapHandler.h; path = joysticks/KeymapHandler.h; sourceTree = "<group>"; };
+		68AE5BC81C9241F800C4D527 /* ButtonMapping.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ButtonMapping.cpp; path = joysticks/generic/ButtonMapping.cpp; sourceTree = "<group>"; };
+		68AE5BC91C9241F800C4D527 /* ButtonMapping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ButtonMapping.h; path = joysticks/generic/ButtonMapping.h; sourceTree = "<group>"; };
+		68AE5BCA1C9241F800C4D527 /* FeatureHandling.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FeatureHandling.cpp; path = joysticks/generic/FeatureHandling.cpp; sourceTree = "<group>"; };
+		68AE5BCB1C9241F800C4D527 /* FeatureHandling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FeatureHandling.h; path = joysticks/generic/FeatureHandling.h; sourceTree = "<group>"; };
+		68AE5BCC1C9241F800C4D527 /* InputHandling.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = InputHandling.cpp; path = joysticks/generic/InputHandling.cpp; sourceTree = "<group>"; };
+		68AE5BCD1C9241F800C4D527 /* InputHandling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = InputHandling.h; path = joysticks/generic/InputHandling.h; sourceTree = "<group>"; };
+		68AE5BD51C92421800C4D527 /* AddonButtonMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AddonButtonMap.cpp; path = addons/AddonButtonMap.cpp; sourceTree = "<group>"; };
+		68AE5BD61C92421800C4D527 /* AddonButtonMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AddonButtonMap.h; path = addons/AddonButtonMap.h; sourceTree = "<group>"; };
+		68AE5BD71C92421800C4D527 /* AddonButtonMapping.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AddonButtonMapping.cpp; path = addons/AddonButtonMapping.cpp; sourceTree = "<group>"; };
+		68AE5BD81C92421800C4D527 /* AddonButtonMapping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AddonButtonMapping.h; path = addons/AddonButtonMapping.h; sourceTree = "<group>"; };
+		68AE5BD91C92421800C4D527 /* AddonInputHandling.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AddonInputHandling.cpp; path = addons/AddonInputHandling.cpp; sourceTree = "<group>"; };
+		68AE5BDA1C92421800C4D527 /* AddonInputHandling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AddonInputHandling.h; path = addons/AddonInputHandling.h; sourceTree = "<group>"; };
+		68AE5BDB1C92421800C4D527 /* PeripheralAddon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PeripheralAddon.cpp; path = addons/PeripheralAddon.cpp; sourceTree = "<group>"; };
+		68AE5BDC1C92421800C4D527 /* PeripheralAddon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PeripheralAddon.h; path = addons/PeripheralAddon.h; sourceTree = "<group>"; };
+		68AE5BDD1C92421800C4D527 /* PeripheralAddonTranslator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PeripheralAddonTranslator.cpp; path = addons/PeripheralAddonTranslator.cpp; sourceTree = "<group>"; };
+		68AE5BDE1C92421800C4D527 /* PeripheralAddonTranslator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PeripheralAddonTranslator.h; path = addons/PeripheralAddonTranslator.h; sourceTree = "<group>"; };
+		68AE5BE91C92422C00C4D527 /* PeripheralBusAddon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PeripheralBusAddon.cpp; sourceTree = "<group>"; };
+		68AE5BEA1C92422C00C4D527 /* PeripheralBusAddon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PeripheralBusAddon.h; sourceTree = "<group>"; };
+		68AE5BED1C92424300C4D527 /* PeripheralJoystick.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PeripheralJoystick.cpp; sourceTree = "<group>"; };
+		68AE5BEE1C92424300C4D527 /* PeripheralJoystick.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PeripheralJoystick.h; sourceTree = "<group>"; };
+		68AE5BF11C92431300C4D527 /* EventScanner.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EventScanner.cpp; sourceTree = "<group>"; };
+		68AE5BF21C92431300C4D527 /* EventScanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventScanner.h; sourceTree = "<group>"; };
+		68AE5BF31C92431300C4D527 /* EventScanRate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EventScanRate.cpp; sourceTree = "<group>"; };
+		68AE5BF41C92431300C4D527 /* EventScanRate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventScanRate.h; sourceTree = "<group>"; };
+		68AE5BFD1C92437900C4D527 /* GUIConfigurationWizard.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GUIConfigurationWizard.cpp; path = games/controllers/windows/GUIConfigurationWizard.cpp; sourceTree = "<group>"; };
+		68AE5BFE1C92437900C4D527 /* GUIConfigurationWizard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GUIConfigurationWizard.h; path = games/controllers/windows/GUIConfigurationWizard.h; sourceTree = "<group>"; };
+		68AE5BFF1C92437900C4D527 /* GUIControllerDefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GUIControllerDefines.h; path = games/controllers/windows/GUIControllerDefines.h; sourceTree = "<group>"; };
+		68AE5C001C92437900C4D527 /* GUIControllerList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GUIControllerList.cpp; path = games/controllers/windows/GUIControllerList.cpp; sourceTree = "<group>"; };
+		68AE5C011C92437900C4D527 /* GUIControllerList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GUIControllerList.h; path = games/controllers/windows/GUIControllerList.h; sourceTree = "<group>"; };
+		68AE5C021C92437900C4D527 /* GUIControllerWindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GUIControllerWindow.cpp; path = games/controllers/windows/GUIControllerWindow.cpp; sourceTree = "<group>"; };
+		68AE5C031C92437900C4D527 /* GUIControllerWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GUIControllerWindow.h; path = games/controllers/windows/GUIControllerWindow.h; sourceTree = "<group>"; };
+		68AE5C041C92437900C4D527 /* GUIFeatureList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GUIFeatureList.cpp; path = games/controllers/windows/GUIFeatureList.cpp; sourceTree = "<group>"; };
+		68AE5C051C92437900C4D527 /* GUIFeatureList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GUIFeatureList.h; path = games/controllers/windows/GUIFeatureList.h; sourceTree = "<group>"; };
+		68AE5C061C92437900C4D527 /* IConfigurationWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IConfigurationWindow.h; path = games/controllers/windows/IConfigurationWindow.h; sourceTree = "<group>"; };
+		68AE5C0F1C92438E00C4D527 /* GUIAnalogStickButton.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GUIAnalogStickButton.cpp; path = games/controllers/guicontrols/GUIAnalogStickButton.cpp; sourceTree = "<group>"; };
+		68AE5C101C92438E00C4D527 /* GUIAnalogStickButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GUIAnalogStickButton.h; path = games/controllers/guicontrols/GUIAnalogStickButton.h; sourceTree = "<group>"; };
+		68AE5C111C92438E00C4D527 /* GUIControllerButton.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GUIControllerButton.cpp; path = games/controllers/guicontrols/GUIControllerButton.cpp; sourceTree = "<group>"; };
+		68AE5C121C92438E00C4D527 /* GUIControllerButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GUIControllerButton.h; path = games/controllers/guicontrols/GUIControllerButton.h; sourceTree = "<group>"; };
+		68AE5C131C92438E00C4D527 /* GUIFeatureButton.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GUIFeatureButton.cpp; path = games/controllers/guicontrols/GUIFeatureButton.cpp; sourceTree = "<group>"; };
+		68AE5C141C92438E00C4D527 /* GUIFeatureButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GUIFeatureButton.h; path = games/controllers/guicontrols/GUIFeatureButton.h; sourceTree = "<group>"; };
+		68AE5C151C92438E00C4D527 /* GUIGameController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GUIGameController.cpp; path = games/controllers/guicontrols/GUIGameController.cpp; sourceTree = "<group>"; };
+		68AE5C161C92438E00C4D527 /* GUIGameController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GUIGameController.h; path = games/controllers/guicontrols/GUIGameController.h; sourceTree = "<group>"; };
+		68AE5C171C92438E00C4D527 /* GUIScalarFeatureButton.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GUIScalarFeatureButton.cpp; path = games/controllers/guicontrols/GUIScalarFeatureButton.cpp; sourceTree = "<group>"; };
+		68AE5C181C92438E00C4D527 /* GUIScalarFeatureButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GUIScalarFeatureButton.h; path = games/controllers/guicontrols/GUIScalarFeatureButton.h; sourceTree = "<group>"; };
+		68AE5C231C9243A000C4D527 /* Controller.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Controller.cpp; path = games/controllers/Controller.cpp; sourceTree = "<group>"; };
+		68AE5C241C9243A000C4D527 /* Controller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Controller.h; path = games/controllers/Controller.h; sourceTree = "<group>"; };
+		68AE5C251C9243A000C4D527 /* ControllerDefinitions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ControllerDefinitions.h; path = games/controllers/ControllerDefinitions.h; sourceTree = "<group>"; };
+		68AE5C261C9243A000C4D527 /* ControllerFeature.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ControllerFeature.cpp; path = games/controllers/ControllerFeature.cpp; sourceTree = "<group>"; };
+		68AE5C271C9243A000C4D527 /* ControllerFeature.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ControllerFeature.h; path = games/controllers/ControllerFeature.h; sourceTree = "<group>"; };
+		68AE5C281C9243A000C4D527 /* ControllerLayout.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ControllerLayout.cpp; path = games/controllers/ControllerLayout.cpp; sourceTree = "<group>"; };
+		68AE5C291C9243A000C4D527 /* ControllerLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ControllerLayout.h; path = games/controllers/ControllerLayout.h; sourceTree = "<group>"; };
+		68AE5C2A1C9243A000C4D527 /* ControllerTranslator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ControllerTranslator.cpp; path = games/controllers/ControllerTranslator.cpp; sourceTree = "<group>"; };
+		68AE5C2B1C9243A000C4D527 /* ControllerTranslator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ControllerTranslator.h; path = games/controllers/ControllerTranslator.h; sourceTree = "<group>"; };
+		68AE5C2C1C9243A000C4D527 /* ControllerTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ControllerTypes.h; path = games/controllers/ControllerTypes.h; sourceTree = "<group>"; };
 		6E97BDBF0DA2B620003A2A89 /* EventClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventClient.h; sourceTree = "<group>"; };
 		6E97BDC00DA2B620003A2A89 /* EventPacket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventPacket.h; sourceTree = "<group>"; };
 		6E97BDC10DA2B620003A2A89 /* EventServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventServer.h; sourceTree = "<group>"; };
@@ -5265,6 +5401,7 @@
 		18B7C8C61294252E009E7A26 /* input */ = {
 			isa = PBXGroup;
 			children = (
+				68AE5BAB1C92419500C4D527 /* joysticks */,
 				E4991332174E5E5C00741B6D /* touch */,
 				18B7C8CB12942546009E7A26 /* ButtonTranslator.cpp */,
 				18B7C8CC12942546009E7A26 /* ButtonTranslator.h */,
@@ -5291,8 +5428,6 @@
 				18B7C8D012942546009E7A26 /* KeyboardStat.h */,
 				18B7C8D112942546009E7A26 /* MouseStat.cpp */,
 				18B7C8D212942546009E7A26 /* MouseStat.h */,
-				18B7C8D312942546009E7A26 /* SDLJoystick.cpp */,
-				18B7C8D412942546009E7A26 /* SDLJoystick.h */,
 				E38E1EAD0D25F9FD00618676 /* XBIRRemote.h */,
 				18B7C8D512942546009E7A26 /* XBMC_keyboard.h */,
 				7C779E31104A57E500F444C4 /* XBMC_keysym.h */,
@@ -5344,6 +5479,8 @@
 		1DAFDB7916DFDCA7007F8C68 /* virtual */ = {
 			isa = PBXGroup;
 			children = (
+				68AE5BE91C92422C00C4D527 /* PeripheralBusAddon.cpp */,
+				68AE5BEA1C92422C00C4D527 /* PeripheralBusAddon.h */,
 				1DAFDB7A16DFDCA7007F8C68 /* PeripheralBusCEC.cpp */,
 				1DAFDB7B16DFDCA7007F8C68 /* PeripheralBusCEC.h */,
 			);
@@ -5920,6 +6057,131 @@
 			path = osx;
 			sourceTree = "<group>";
 		};
+		68AE5BA21C92410300C4D527 /* Peripheral */ = {
+			isa = PBXGroup;
+			children = (
+				68AE5BA31C92412900C4D527 /* AddonCallbacksPeripheral.cpp */,
+				68AE5BA41C92412900C4D527 /* AddonCallbacksPeripheral.h */,
+			);
+			name = Peripheral;
+			sourceTree = "<group>";
+		};
+		68AE5BAB1C92419500C4D527 /* joysticks */ = {
+			isa = PBXGroup;
+			children = (
+				68AE5BC71C9241E200C4D527 /* generic */,
+				68AE5BAC1C9241DF00C4D527 /* DefaultJoystick.cpp */,
+				68AE5BAD1C9241DF00C4D527 /* DefaultJoystick.h */,
+				68AE5BAE1C9241DF00C4D527 /* DriverPrimitive.cpp */,
+				68AE5BAF1C9241DF00C4D527 /* DriverPrimitive.h */,
+				68AE5BB01C9241DF00C4D527 /* IButtonMap.h */,
+				68AE5BB11C9241DF00C4D527 /* IButtonMapper.h */,
+				68AE5BB21C9241DF00C4D527 /* IDriverHandler.h */,
+				68AE5BB31C9241DF00C4D527 /* IInputHandler.h */,
+				68AE5BB41C9241DF00C4D527 /* IKeymapHandler.h */,
+				68AE5BB51C9241DF00C4D527 /* JoystickMonitor.cpp */,
+				68AE5BB61C9241DF00C4D527 /* JoystickMonitor.h */,
+				68AE5BB71C9241DF00C4D527 /* JoystickTranslator.cpp */,
+				68AE5BB81C9241DF00C4D527 /* JoystickTranslator.h */,
+				68AE5BB91C9241DF00C4D527 /* JoystickTypes.h */,
+				68AE5BBA1C9241DF00C4D527 /* JoystickUtils.h */,
+				68AE5BBB1C9241DF00C4D527 /* KeymapHandler.cpp */,
+				68AE5BBC1C9241DF00C4D527 /* KeymapHandler.h */,
+			);
+			name = joysticks;
+			sourceTree = "<group>";
+		};
+		68AE5BC71C9241E200C4D527 /* generic */ = {
+			isa = PBXGroup;
+			children = (
+				68AE5BC81C9241F800C4D527 /* ButtonMapping.cpp */,
+				68AE5BC91C9241F800C4D527 /* ButtonMapping.h */,
+				68AE5BCA1C9241F800C4D527 /* FeatureHandling.cpp */,
+				68AE5BCB1C9241F800C4D527 /* FeatureHandling.h */,
+				68AE5BCC1C9241F800C4D527 /* InputHandling.cpp */,
+				68AE5BCD1C9241F800C4D527 /* InputHandling.h */,
+			);
+			name = generic;
+			sourceTree = "<group>";
+		};
+		68AE5BD41C92420200C4D527 /* addons */ = {
+			isa = PBXGroup;
+			children = (
+				68AE5BD51C92421800C4D527 /* AddonButtonMap.cpp */,
+				68AE5BD61C92421800C4D527 /* AddonButtonMap.h */,
+				68AE5BD71C92421800C4D527 /* AddonButtonMapping.cpp */,
+				68AE5BD81C92421800C4D527 /* AddonButtonMapping.h */,
+				68AE5BD91C92421800C4D527 /* AddonInputHandling.cpp */,
+				68AE5BDA1C92421800C4D527 /* AddonInputHandling.h */,
+				68AE5BDB1C92421800C4D527 /* PeripheralAddon.cpp */,
+				68AE5BDC1C92421800C4D527 /* PeripheralAddon.h */,
+				68AE5BDD1C92421800C4D527 /* PeripheralAddonTranslator.cpp */,
+				68AE5BDE1C92421800C4D527 /* PeripheralAddonTranslator.h */,
+			);
+			name = addons;
+			sourceTree = "<group>";
+		};
+		68AE5BF91C92431F00C4D527 /* games */ = {
+			isa = PBXGroup;
+			children = (
+				68AE5BFA1C92433900C4D527 /* controllers */,
+			);
+			name = games;
+			sourceTree = "<group>";
+		};
+		68AE5BFA1C92433900C4D527 /* controllers */ = {
+			isa = PBXGroup;
+			children = (
+				68AE5BFB1C92435200C4D527 /* guicontrols */,
+				68AE5BFC1C92436500C4D527 /* windows */,
+				68AE5C231C9243A000C4D527 /* Controller.cpp */,
+				68AE5C241C9243A000C4D527 /* Controller.h */,
+				68AE5C251C9243A000C4D527 /* ControllerDefinitions.h */,
+				68AE5C261C9243A000C4D527 /* ControllerFeature.cpp */,
+				68AE5C271C9243A000C4D527 /* ControllerFeature.h */,
+				68AE5C281C9243A000C4D527 /* ControllerLayout.cpp */,
+				68AE5C291C9243A000C4D527 /* ControllerLayout.h */,
+				68AE5C2A1C9243A000C4D527 /* ControllerTranslator.cpp */,
+				68AE5C2B1C9243A000C4D527 /* ControllerTranslator.h */,
+				68AE5C2C1C9243A000C4D527 /* ControllerTypes.h */,
+			);
+			name = controllers;
+			sourceTree = "<group>";
+		};
+		68AE5BFB1C92435200C4D527 /* guicontrols */ = {
+			isa = PBXGroup;
+			children = (
+				68AE5C0F1C92438E00C4D527 /* GUIAnalogStickButton.cpp */,
+				68AE5C101C92438E00C4D527 /* GUIAnalogStickButton.h */,
+				68AE5C111C92438E00C4D527 /* GUIControllerButton.cpp */,
+				68AE5C121C92438E00C4D527 /* GUIControllerButton.h */,
+				68AE5C131C92438E00C4D527 /* GUIFeatureButton.cpp */,
+				68AE5C141C92438E00C4D527 /* GUIFeatureButton.h */,
+				68AE5C151C92438E00C4D527 /* GUIGameController.cpp */,
+				68AE5C161C92438E00C4D527 /* GUIGameController.h */,
+				68AE5C171C92438E00C4D527 /* GUIScalarFeatureButton.cpp */,
+				68AE5C181C92438E00C4D527 /* GUIScalarFeatureButton.h */,
+			);
+			name = guicontrols;
+			sourceTree = "<group>";
+		};
+		68AE5BFC1C92436500C4D527 /* windows */ = {
+			isa = PBXGroup;
+			children = (
+				68AE5BFD1C92437900C4D527 /* GUIConfigurationWizard.cpp */,
+				68AE5BFE1C92437900C4D527 /* GUIConfigurationWizard.h */,
+				68AE5BFF1C92437900C4D527 /* GUIControllerDefines.h */,
+				68AE5C001C92437900C4D527 /* GUIControllerList.cpp */,
+				68AE5C011C92437900C4D527 /* GUIControllerList.h */,
+				68AE5C021C92437900C4D527 /* GUIControllerWindow.cpp */,
+				68AE5C031C92437900C4D527 /* GUIControllerWindow.h */,
+				68AE5C041C92437900C4D527 /* GUIFeatureList.cpp */,
+				68AE5C051C92437900C4D527 /* GUIFeatureList.h */,
+				68AE5C061C92437900C4D527 /* IConfigurationWindow.h */,
+			);
+			name = windows;
+			sourceTree = "<group>";
+		};
 		76F4C37B1C8E927A00A1E64B /* InputStream */ = {
 			isa = PBXGroup;
 			children = (
@@ -7384,6 +7646,7 @@
 				DF29BCD41B5D911700904347 /* events */,
 				431376E912D6439900680C15 /* dialogs */,
 				E38E16940D25F9FA00618676 /* filesystem */,
+				68AE5BF91C92431F00C4D527 /* games */,
 				18B7C3AA1294219F009E7A26 /* guilib */,
 				18B7C8C61294252E009E7A26 /* input */,
 				4367217312D6640E002508E6 /* interfaces */,
@@ -8699,7 +8962,12 @@
 				EDE8C70F1C7F618500A86ECC /* kodi_audiodec_dll.h */,
 				EDE8C7101C7F618500A86ECC /* kodi_audiodec_types.h */,
 				EDE8C7111C7F618500A86ECC /* kodi_audioengine_types.h */,
+				68AE5BA71C92414B00C4D527 /* kodi_peripheral_callbacks.h */,
+				68AE5BA81C92414B00C4D527 /* kodi_peripheral_dll.h */,
+				68AE5BA91C92414B00C4D527 /* kodi_peripheral_types.h */,
+				68AE5BAA1C92414B00C4D527 /* kodi_peripheral_utils.hpp */,
 				EDE8C7121C7F618500A86ECC /* kodi_vfs_types.h */,
+				68AE5BA01C923E5300C4D527 /* kodi_vfs_utils.hpp */,
 				EDE8C7131C7F618500A86ECC /* libKODI_adsp.h */,
 				EDE8C7141C7F618500A86ECC /* libKODI_audioengine.h */,
 				EDE8C7151C7F618500A86ECC /* libKODI_guilib.h */,
@@ -8752,6 +9020,7 @@
 				EDED2E821C878CF6000F5E80 /* Codec */,
 				EDED2E801C878CB4000F5E80 /* GUI */,
 				76F4C37B1C8E927A00A1E64B /* InputStream */,
+				68AE5BA21C92410300C4D527 /* Peripheral */,
 				EDED2E811C878CC1000F5E80 /* PVR */,
 			);
 			name = api1;
@@ -8938,9 +9207,14 @@
 		F5E1050C140AA38000175026 /* peripherals */ = {
 			isa = PBXGroup;
 			children = (
+				68AE5BD41C92420200C4D527 /* addons */,
 				F5E1050D140AA38000175026 /* bus */,
 				F5E1051A140AA38000175026 /* devices */,
 				F5E1052C140AA38000175026 /* dialogs */,
+				68AE5BF11C92431300C4D527 /* EventScanner.cpp */,
+				68AE5BF21C92431300C4D527 /* EventScanner.h */,
+				68AE5BF31C92431300C4D527 /* EventScanRate.cpp */,
+				68AE5BF41C92431300C4D527 /* EventScanRate.h */,
 				F5E10533140AA38000175026 /* Peripherals.cpp */,
 				F5E10534140AA38000175026 /* Peripherals.h */,
 				F5E10535140AA38000175026 /* PeripheralTypes.h */,
@@ -8983,6 +9257,8 @@
 				F5E10525140AA38000175026 /* PeripheralHID.h */,
 				1D638126161E211E003603ED /* PeripheralImon.cpp */,
 				1D638127161E211E003603ED /* PeripheralImon.h */,
+				68AE5BED1C92424300C4D527 /* PeripheralJoystick.cpp */,
+				68AE5BEE1C92424300C4D527 /* PeripheralJoystick.h */,
 				F5E10526140AA38000175026 /* PeripheralNIC.cpp */,
 				F5E10527140AA38000175026 /* PeripheralNIC.h */,
 				F5E10528140AA38000175026 /* PeripheralNyxboard.cpp */,
@@ -9360,6 +9636,7 @@
 				DF6A0D841A4584E80075BBFC /* OverrideFile.cpp in Sources */,
 				E38E1F9A0D25F9FD00618676 /* DVDInputStreamFFmpeg.cpp in Sources */,
 				E38E1F9B0D25F9FD00618676 /* DVDInputStreamFile.cpp in Sources */,
+				68AE5C1D1C92438E00C4D527 /* GUIFeatureButton.cpp in Sources */,
 				E38E1F9D0D25F9FD00618676 /* DVDInputStreamMemory.cpp in Sources */,
 				E38E1F9E0D25F9FD00618676 /* DVDInputStreamNavigator.cpp in Sources */,
 				E38E1F9F0D25F9FD00618676 /* DVDStateSerializer.cpp in Sources */,
@@ -9386,6 +9663,7 @@
 				E38E1FF10D25F9FD00618676 /* YUV2RGBShader.cpp in Sources */,
 				E38E1FF70D25F9FD00618676 /* CueDocument.cpp in Sources */,
 				E38E1FF80D25F9FD00618676 /* Database.cpp in Sources */,
+				68AE5C0B1C92437900C4D527 /* GUIControllerWindow.cpp in Sources */,
 				E38E1FFA0D25F9FD00618676 /* DetectDVDType.cpp in Sources */,
 				E38E1FFB0D25F9FD00618676 /* DNSNameCache.cpp in Sources */,
 				EDED2E941C878EE0000F5E80 /* AddonCallbacksAddon.cpp in Sources */,
@@ -9409,6 +9687,7 @@
 				E38E20270D25F9FD00618676 /* IDirectory.cpp in Sources */,
 				E38E20280D25F9FD00618676 /* IFile.cpp in Sources */,
 				E38E20290D25F9FD00618676 /* iso9660.cpp in Sources */,
+				68AE5BEF1C92424300C4D527 /* PeripheralJoystick.cpp in Sources */,
 				39B4F3701B96F845009B2D88 /* RepositoryUpdater.cpp in Sources */,
 				E38E202A0D25F9FD00618676 /* ISO9660Directory.cpp in Sources */,
 				E38E20330D25F9FD00618676 /* MultiPathDirectory.cpp in Sources */,
@@ -9437,6 +9716,7 @@
 				E38E204B0D25F9FD00618676 /* MusicSearchDirectory.cpp in Sources */,
 				E38E204F0D25F9FD00618676 /* PlaylistDirectory.cpp in Sources */,
 				E38E20500D25F9FD00618676 /* PlaylistFileDirectory.cpp in Sources */,
+				68AE5C1B1C92438E00C4D527 /* GUIControllerButton.cpp in Sources */,
 				E38E20510D25F9FD00618676 /* PluginDirectory.cpp in Sources */,
 				7CF3194B1BD2C65500A44A41 /* MusicInfoTagLoaderFFmpeg.cpp in Sources */,
 				E38E20520D25F9FD00618676 /* RarDirectory.cpp in Sources */,
@@ -9454,6 +9734,7 @@
 				E38E20660D25F9FD00618676 /* DirectoryNodeRecentlyAddedEpisodes.cpp in Sources */,
 				DF4BF01D1A4EF3410053AC56 /* DVDDemuxCC.cpp in Sources */,
 				7C8E02281BA35D0B0072E8B2 /* GUIBuiltins.cpp in Sources */,
+				68AE5BC31C9241DF00C4D527 /* JoystickTranslator.cpp in Sources */,
 				7CFC08381C5BA7D0000E5E73 /* DVDDemuxClient.cpp in Sources */,
 				E38E20670D25F9FD00618676 /* DirectoryNodeRecentlyAddedMovies.cpp in Sources */,
 				E38E20680D25F9FD00618676 /* DirectoryNodeRecentlyAddedMusicVideos.cpp in Sources */,
@@ -9473,6 +9754,7 @@
 				E38E20780D25F9FD00618676 /* ZipManager.cpp in Sources */,
 				E38E207B0D25F9FD00618676 /* GUIDialogBoxBase.cpp in Sources */,
 				E38E207C0D25F9FD00618676 /* GUIDialogBusy.cpp in Sources */,
+				68AE5BBF1C9241DF00C4D527 /* DriverPrimitive.cpp in Sources */,
 				E38E207D0D25F9FD00618676 /* GUIDialogButtonMenu.cpp in Sources */,
 				E38E207F0D25F9FD00618676 /* GUIDialogContextMenu.cpp in Sources */,
 				E38E20800D25F9FD00618676 /* GUIDialogFavourites.cpp in Sources */,
@@ -9509,6 +9791,7 @@
 				E38E20B20D25F9FD00618676 /* GUIWindowLoginScreen.cpp in Sources */,
 				E38E20B30D25F9FD00618676 /* GUIWindowMusicBase.cpp in Sources */,
 				E38E20B40D25F9FD00618676 /* GUIDialogMusicInfo.cpp in Sources */,
+				68AE5BBD1C9241DF00C4D527 /* DefaultJoystick.cpp in Sources */,
 				E38E20B50D25F9FD00618676 /* GUIWindowMusicNav.cpp in Sources */,
 				E38E20B70D25F9FD00618676 /* GUIWindowMusicPlaylist.cpp in Sources */,
 				395C29F61A98B44B00EBC7AD /* AddonModuleXbmcwsgi.cpp in Sources */,
@@ -9524,6 +9807,7 @@
 				E38E20C70D25F9FD00618676 /* GUIWindowSlideShow.cpp in Sources */,
 				E38E20C80D25F9FD00618676 /* GUIWindowStartup.cpp in Sources */,
 				E38E20C90D25F9FD00618676 /* GUIWindowSystemInfo.cpp in Sources */,
+				68AE5BC11C9241DF00C4D527 /* JoystickMonitor.cpp in Sources */,
 				E38E20CA0D25F9FD00618676 /* GUIWindowVideoBase.cpp in Sources */,
 				E38E20CC0D25F9FD00618676 /* GUIDialogVideoInfo.cpp in Sources */,
 				E38E20CD0D25F9FD00618676 /* GUIWindowVideoNav.cpp in Sources */,
@@ -9601,6 +9885,7 @@
 				E38E22A10D25F9FE00618676 /* Picture.cpp in Sources */,
 				E38E22A20D25F9FE00618676 /* PictureInfoLoader.cpp in Sources */,
 				E38E22A30D25F9FE00618676 /* PictureInfoTag.cpp in Sources */,
+				68AE5BEB1C92422C00C4D527 /* PeripheralBusAddon.cpp in Sources */,
 				E38E22A40D25F9FE00618676 /* PictureThumbLoader.cpp in Sources */,
 				E38E22AA0D25F9FE00618676 /* PlayListPlayer.cpp in Sources */,
 				E38E22B30D25F9FE00618676 /* SectionLoader.cpp in Sources */,
@@ -9648,6 +9933,7 @@
 				E38E25780D263BF600618676 /* unpack.cpp in Sources */,
 				E38E257C0D263C4400618676 /* rar.cpp in Sources */,
 				E38E25C00D263DC100618676 /* DVDFactoryDemuxer.cpp in Sources */,
+				68AE5BA51C92412900C4D527 /* AddonCallbacksPeripheral.cpp in Sources */,
 				E38E25C30D263DE200618676 /* DVDDemuxFFmpeg.cpp in Sources */,
 				E3A4780A0D29029A00F3C3A6 /* GUIDialogCache.cpp in Sources */,
 				395C29ED1A98A16300EBC7AD /* HTTPPythonInvoker.cpp in Sources */,
@@ -9656,6 +9942,7 @@
 				395897151AAD94F00033D27C /* KeyboardLayoutManager.cpp in Sources */,
 				E36578880D3AA7B40033CC1C /* VideoPlayerCodec.cpp in Sources */,
 				E33206380D5070AA00435CE3 /* DVDDemuxVobsub.cpp in Sources */,
+				68AE5C071C92437900C4D527 /* GUIConfigurationWizard.cpp in Sources */,
 				E3DAAF8D0D6E1B0500F17647 /* SMBDirectory.cpp in Sources */,
 				E3E91FFD0D8C61DF002BF43D /* EventPacket.cpp in Sources */,
 				E3E91FFE0D8C61DF002BF43D /* EventServer.cpp in Sources */,
@@ -9693,6 +9980,7 @@
 				F584E12E0F257C5100DB26A5 /* HTTPDirectory.cpp in Sources */,
 				397877D51AAAF87700F98A45 /* Speed.cpp in Sources */,
 				7C8E02341BA35D0B0072E8B2 /* OpticalBuiltins.cpp in Sources */,
+				68AE5BF51C92431300C4D527 /* EventScanner.cpp in Sources */,
 				DF29BCF71B5D911800904347 /* MediaLibraryEvent.cpp in Sources */,
 				2F4564D51970129A00396109 /* GUIFontCache.cpp in Sources */,
 				7CEBD8A80F33A0D800CAF6AD /* SpecialProtocolDirectory.cpp in Sources */,
@@ -9716,6 +10004,7 @@
 				B5101B5819DFF8DD00294D1E /* BlurayFile.cpp in Sources */,
 				E49ACD9F10074A4000A86ECD /* ZeroconfBrowserOSX.cpp in Sources */,
 				DF6F52AE1AF6D03F001BC57D /* dacp.cpp in Sources */,
+				68AE5C2F1C9243A000C4D527 /* ControllerFeature.cpp in Sources */,
 				E49ACDD510074F9200A86ECD /* ZeroconfBrowser.cpp in Sources */,
 				F5D8EF5B103912A4004A11AB /* DVDSubtitleParserVplayer.cpp in Sources */,
 				7C8E02491BA35D0B0072E8B2 /* WeatherBuiltins.cpp in Sources */,
@@ -9782,6 +10071,7 @@
 				F5BDB81A1202032400F0B710 /* DVDSubtitleTagMicroDVD.cpp in Sources */,
 				7CF1FB0C123B1AF000B2CBCB /* Variant.cpp in Sources */,
 				C8D0B2AF1265A9A800F0C0AC /* SystemGlobals.cpp in Sources */,
+				68AE5C311C9243A000C4D527 /* ControllerLayout.cpp in Sources */,
 				7CBEBB8412912BA400431822 /* fstrcmp.c in Sources */,
 				184C472F1296BC6E0006DB3E /* Service.cpp in Sources */,
 				18B7C3841294203F009E7A26 /* AddonDatabase.cpp in Sources */,
@@ -9811,6 +10101,7 @@
 				18B7C7BB1294222E009E7A26 /* GUIControlProfiler.cpp in Sources */,
 				18B7C7BC1294222E009E7A26 /* GUIDialog.cpp in Sources */,
 				18B7C7BD1294222E009E7A26 /* GUIEditControl.cpp in Sources */,
+				68AE5BF71C92431300C4D527 /* EventScanRate.cpp in Sources */,
 				18B7C7BE1294222E009E7A26 /* GUIFadeLabelControl.cpp in Sources */,
 				18B7C7BF1294222E009E7A26 /* GUIFixedListContainer.cpp in Sources */,
 				18B7C7C01294222E009E7A26 /* GUIFont.cpp in Sources */,
@@ -9825,6 +10116,7 @@
 				4260D5C71B67BB8F003F6F2D /* GUIWindowSplash.cpp in Sources */,
 				18B7C7C91294222E009E7A26 /* GUILabelControl.cpp in Sources */,
 				18B7C7CA1294222E009E7A26 /* GUIListContainer.cpp in Sources */,
+				68AE5BE71C92421800C4D527 /* PeripheralAddonTranslator.cpp in Sources */,
 				18B7C7CB1294222E009E7A26 /* GUIListGroup.cpp in Sources */,
 				18B7C7CC1294222E009E7A26 /* GUIListItem.cpp in Sources */,
 				18B7C7CD1294222E009E7A26 /* GUIListItemLayout.cpp in Sources */,
@@ -9883,7 +10175,6 @@
 				18B7C8D712942546009E7A26 /* ButtonTranslator.cpp in Sources */,
 				18B7C8D912942546009E7A26 /* KeyboardStat.cpp in Sources */,
 				18B7C8DA12942546009E7A26 /* MouseStat.cpp in Sources */,
-				18B7C8DB12942546009E7A26 /* SDLJoystick.cpp in Sources */,
 				18B7C8E912942603009E7A26 /* Crc32.cpp in Sources */,
 				18B7C8EE12942613009E7A26 /* URIUtils.cpp in Sources */,
 				18B7C8F31294261F009E7A26 /* StringUtils.cpp in Sources */,
@@ -9931,10 +10222,12 @@
 				1840B75313993DA0007C848B /* JSONVariantWriter.cpp in Sources */,
 				18B700E113A6A5750009C1AF /* AddonVersion.cpp in Sources */,
 				F558F25613ABCF7800631E12 /* WinEventsOSX.mm in Sources */,
+				68AE5C191C92438E00C4D527 /* GUIAnalogStickButton.cpp in Sources */,
 				F558F27B13ABD56600631E12 /* DirtyRegionSolvers.cpp in Sources */,
 				F558F27F13ABD57400631E12 /* DirtyRegionTracker.cpp in Sources */,
 				F558F29613ABD7DF00631E12 /* GUIWindowDebugInfo.cpp in Sources */,
 				DF0DF15C13A3ADA7008ED511 /* NFSDirectory.cpp in Sources */,
+				68AE5C211C92438E00C4D527 /* GUIScalarFeatureButton.cpp in Sources */,
 				7C89619213B6A16F003631FE /* GUIWindowScreensaverDim.cpp in Sources */,
 				18ECC96213CF178D00A9ED6C /* StreamUtils.cpp in Sources */,
 				7C8E02401BA35D0B0072E8B2 /* PVRBuiltins.cpp in Sources */,
@@ -9984,11 +10277,13 @@
 				DFCA6ACB152245CD000BFAAE /* IHTTPRequestHandler.cpp in Sources */,
 				DF93D69A1444A8B1007C6459 /* DirectoryCache.cpp in Sources */,
 				DF93D69B1444A8B1007C6459 /* FileCache.cpp in Sources */,
+				68AE5BE31C92421800C4D527 /* AddonInputHandling.cpp in Sources */,
 				3994427A1A8DD920006C39E9 /* VideoLibraryScanningJob.cpp in Sources */,
 				DF93D69C1444A8B1007C6459 /* CDDAFile.cpp in Sources */,
 				DF93D69D1444A8B1007C6459 /* CurlFile.cpp in Sources */,
 				DF93D69F1444A8B1007C6459 /* DirectoryFactory.cpp in Sources */,
 				DF93D6A01444A8B1007C6459 /* FileDirectoryFactory.cpp in Sources */,
+				68AE5C2D1C9243A000C4D527 /* Controller.cpp in Sources */,
 				DF2401261B41A26F001E02DA /* ImageResource.cpp in Sources */,
 				DF93D6A11444A8B1007C6459 /* FileReaderFile.cpp in Sources */,
 				DF93D6A31444A8B1007C6459 /* ISOFile.cpp in Sources */,
@@ -10062,6 +10357,7 @@
 				C84828F5156CFD5E005A996F /* Epg.cpp in Sources */,
 				C84828F6156CFD5E005A996F /* EpgContainer.cpp in Sources */,
 				C84828F7156CFD5E005A996F /* EpgDatabase.cpp in Sources */,
+				68AE5C331C9243A000C4D527 /* ControllerTranslator.cpp in Sources */,
 				C84828F8156CFD5E005A996F /* EpgInfoTag.cpp in Sources */,
 				C84828F9156CFD5E005A996F /* EpgSearchFilter.cpp in Sources */,
 				C84828FA156CFD5E005A996F /* GUIEPGGridContainer.cpp in Sources */,
@@ -10124,6 +10420,7 @@
 				DFB25D3B163D4743006C4A48 /* LanguageHook.cpp in Sources */,
 				DFB25D3C163D4743006C4A48 /* ListItem.cpp in Sources */,
 				DFB25D3D163D4743006C4A48 /* ModuleXbmc.cpp in Sources */,
+				68AE5BD01C9241F800C4D527 /* FeatureHandling.cpp in Sources */,
 				DFB25D3E163D4743006C4A48 /* ModuleXbmcgui.cpp in Sources */,
 				DFB25D3F163D4743006C4A48 /* ModuleXbmcplugin.cpp in Sources */,
 				DFB25D40163D4743006C4A48 /* ModuleXbmcvfs.cpp in Sources */,
@@ -10148,9 +10445,11 @@
 				DF402A64164461B9001C56B8 /* LanguageHook.cpp in Sources */,
 				DF402A65164461B9001C56B8 /* swig.cpp in Sources */,
 				DF402A66164461B9001C56B8 /* XBPython.cpp in Sources */,
+				68AE5C0D1C92437900C4D527 /* GUIFeatureList.cpp in Sources */,
 				F5EDC48C1651A6F900B852D8 /* GroupUtils.cpp in Sources */,
 				7C7CEAF1165629530059C9EB /* AELimiter.cpp in Sources */,
 				DFB02DEA16629DBA00F37752 /* PyContext.cpp in Sources */,
+				68AE5C1F1C92438E00C4D527 /* GUIGameController.cpp in Sources */,
 				DF072534168734ED008DCAAD /* FFmpegVideoDecoder.cpp in Sources */,
 				7C8E02221BA35D0B0072E8B2 /* Builtins.cpp in Sources */,
 				395F6DE21A81FACF0088CC74 /* HTTPImageTransformationHandler.cpp in Sources */,
@@ -10201,6 +10500,8 @@
 				DFE4095B17417FDF00473BD9 /* LegacyPathTranslation.cpp in Sources */,
 				39C38CCA1BBFF1EE000F59F5 /* InputCodingTableKorean.cpp in Sources */,
 				0E3036EC1760F68A00D93596 /* FavouritesDirectory.cpp in Sources */,
+				68AE5BE11C92421800C4D527 /* AddonButtonMapping.cpp in Sources */,
+				68AE5C091C92437900C4D527 /* GUIControllerList.cpp in Sources */,
 				7C8E02461BA35D0B0072E8B2 /* SystemBuiltins.cpp in Sources */,
 				551C3A45175A12010051AAAD /* VDA.cpp in Sources */,
 				DFBB431B178B5E6F006CC20A /* CompileInfo.cpp in Sources */,
@@ -10215,6 +10516,7 @@
 				DFD882F817DD1A5B001516FE /* AddonPythonInvoker.cpp in Sources */,
 				DFD882E917DD189E001516FE /* StringValidation.cpp in Sources */,
 				F500E35617F3412C004FC217 /* WinEvents.cpp in Sources */,
+				68AE5BE51C92421800C4D527 /* PeripheralAddon.cpp in Sources */,
 				7C2612711825B6340086E04D /* DatabaseQuery.cpp in Sources */,
 				7C920CF9181669FF00DA1477 /* TextureOperations.cpp in Sources */,
 				DFEF0BAC180ADE6400AEAED1 /* FileItemListModification.cpp in Sources */,
@@ -10227,6 +10529,7 @@
 				7C4E6F721829AA9700F1068F /* GUIDialogSubtitles.cpp in Sources */,
 				7C140989183224B8009F9411 /* ISetting.cpp in Sources */,
 				7C14098C183224B8009F9411 /* ISettingControl.cpp in Sources */,
+				68AE5BDF1C92421800C4D527 /* AddonButtonMap.cpp in Sources */,
 				7C14098F183224B8009F9411 /* Setting.cpp in Sources */,
 				DF56EF241A798A5E00CAAEFB /* HttpRangeUtils.cpp in Sources */,
 				7C140992183224B8009F9411 /* SettingCategoryAccess.cpp in Sources */,
@@ -10234,6 +10537,7 @@
 				7C140998183224B8009F9411 /* SettingDependency.cpp in Sources */,
 				2AC7EB5B1C21F6BA00BDAA95 /* GUIWindowPVRTimersBase.cpp in Sources */,
 				7C14099B183224B8009F9411 /* SettingRequirement.cpp in Sources */,
+				68AE5BD21C9241F800C4D527 /* InputHandling.cpp in Sources */,
 				7C14099E183224B8009F9411 /* SettingSection.cpp in Sources */,
 				39C38CE11BCD600E000F59F5 /* FFmpegImage.cpp in Sources */,
 				7C1409A1183224B8009F9411 /* SettingsManager.cpp in Sources */,
@@ -10308,6 +10612,7 @@
 				7CCDA1F3192753E30074CF51 /* ConnectionManagerSCPD.cpp in Sources */,
 				7CCDA1FE192753E30074CF51 /* ContentDirectorySCPD.cpp in Sources */,
 				7CCDA209192753E30074CF51 /* ContentDirectorywSearchSCPD.cpp in Sources */,
+				68AE5BCE1C9241F800C4D527 /* ButtonMapping.cpp in Sources */,
 				EDED2E9B1C878F61000F5E80 /* AddonInterfaces.cpp in Sources */,
 				7CCDA214192753E30074CF51 /* PltDidl.cpp in Sources */,
 				7CCDA21D192753E30074CF51 /* PltFileMediaServer.cpp in Sources */,
@@ -10346,6 +10651,7 @@
 				7CCDA7F1192756250074CF51 /* NptNetwork.cpp in Sources */,
 				7CCDA7FA192756250074CF51 /* NptQueue.cpp in Sources */,
 				7CCDA803192756250074CF51 /* NptResults.cpp in Sources */,
+				68AE5BC51C9241DF00C4D527 /* KeymapHandler.cpp in Sources */,
 				7CCDA806192756250074CF51 /* NptRingBuffer.cpp in Sources */,
 				395C29FB1A9CD20C00EBC7AD /* ContextMenuManager.cpp in Sources */,
 				7CCDA80F192756250074CF51 /* NptSimpleMessageQueue.cpp in Sources */,
@@ -10403,15 +10709,18 @@
 				DF4BF0181A4EF31E0053AC56 /* cc_decoder708.cpp in Sources */,
 				DF1D2DF41B6E85EE002BB9DB /* XbtManager.cpp in Sources */,
 				E499114F174E5CC300741B6D /* archive.cpp in Sources */,
+				68AE5BF01C92424400C4D527 /* PeripheralJoystick.cpp in Sources */,
 				E4991150174E5CC300741B6D /* arcread.cpp in Sources */,
 				E4991151174E5CC300741B6D /* cmddata.cpp in Sources */,
 				E4991152174E5CC300741B6D /* consio.cpp in Sources */,
 				E4991153174E5CC300741B6D /* crc.cpp in Sources */,
 				E4991154174E5CC300741B6D /* crypt.cpp in Sources */,
+				68AE5BC01C9241DF00C4D527 /* DriverPrimitive.cpp in Sources */,
 				E4991155174E5CC300741B6D /* encname.cpp in Sources */,
 				E4991156174E5CC300741B6D /* errhnd.cpp in Sources */,
 				E4991157174E5CC300741B6D /* extinfo.cpp in Sources */,
 				E4991158174E5CC300741B6D /* extract.cpp in Sources */,
+				68AE5BCF1C9241F800C4D527 /* ButtonMapping.cpp in Sources */,
 				E4991159174E5CC300741B6D /* filcreat.cpp in Sources */,
 				E499115A174E5CC300741B6D /* file.cpp in Sources */,
 				E499115B174E5CC300741B6D /* filefn.cpp in Sources */,
@@ -10429,6 +10738,7 @@
 				E4991167174E5CC300741B6D /* rarvm.cpp in Sources */,
 				E4991168174E5CC300741B6D /* rawread.cpp in Sources */,
 				E4991169174E5CC300741B6D /* rdwrfn.cpp in Sources */,
+				68AE5C1C1C92438E00C4D527 /* GUIControllerButton.cpp in Sources */,
 				E499116A174E5CC300741B6D /* recvol.cpp in Sources */,
 				E499116B174E5CC300741B6D /* resource.cpp in Sources */,
 				E499116C174E5CC300741B6D /* rijndael.cpp in Sources */,
@@ -10453,6 +10763,7 @@
 				E4991181174E5CE000741B6D /* AddonStatusHandler.cpp in Sources */,
 				E4991182174E5CE000741B6D /* AddonVersion.cpp in Sources */,
 				E4991183174E5CE000741B6D /* GUIDialogAddonInfo.cpp in Sources */,
+				68AE5C081C92437900C4D527 /* GUIConfigurationWizard.cpp in Sources */,
 				E4991184174E5CE000741B6D /* GUIDialogAddonSettings.cpp in Sources */,
 				E4991185174E5CE000741B6D /* GUIViewStateAddonBrowser.cpp in Sources */,
 				E4991186174E5CE000741B6D /* GUIWindowAddonBrowser.cpp in Sources */,
@@ -10579,6 +10890,7 @@
 				E4991224174E5D5A00741B6D /* OverlayRendererUtil.cpp in Sources */,
 				E4991225174E5D5A00741B6D /* RenderCapture.cpp in Sources */,
 				E4991226174E5D5A00741B6D /* RenderManager.cpp in Sources */,
+				68AE5BC61C9241DF00C4D527 /* KeymapHandler.cpp in Sources */,
 				E4991228174E5D6100741B6D /* Database.cpp in Sources */,
 				E4991229174E5D6100741B6D /* dataset.cpp in Sources */,
 				E499122A174E5D6100741B6D /* mysqldataset.cpp in Sources */,
@@ -10594,6 +10906,7 @@
 				E4991233174E5D7E00741B6D /* GUIDialogBoxBase.cpp in Sources */,
 				E4991234174E5D7E00741B6D /* GUIDialogBusy.cpp in Sources */,
 				E4991235174E5D7E00741B6D /* GUIDialogButtonMenu.cpp in Sources */,
+				68AE5C301C9243A000C4D527 /* ControllerFeature.cpp in Sources */,
 				E4991236174E5D7E00741B6D /* GUIDialogCache.cpp in Sources */,
 				E4991237174E5D7E00741B6D /* GUIDialogContextMenu.cpp in Sources */,
 				395C29D61A98A11C00EBC7AD /* WsgiErrorStream.cpp in Sources */,
@@ -10624,10 +10937,12 @@
 				E499124D174E5D7E00741B6D /* GUIDialogVolumeBar.cpp in Sources */,
 				E499124E174E5D7E00741B6D /* GUIDialogYesNo.cpp in Sources */,
 				E499124F174E5D8F00741B6D /* AddonsDirectory.cpp in Sources */,
+				68AE5C2E1C9243A000C4D527 /* Controller.cpp in Sources */,
 				E4991253174E5D8F00741B6D /* BlurayDirectory.cpp in Sources */,
 				E4991254174E5D8F00741B6D /* CacheStrategy.cpp in Sources */,
 				E4991255174E5D8F00741B6D /* CDDADirectory.cpp in Sources */,
 				E4991256174E5D8F00741B6D /* CDDAFile.cpp in Sources */,
+				68AE5BC41C9241DF00C4D527 /* JoystickTranslator.cpp in Sources */,
 				E4991257174E5D8F00741B6D /* CircularCache.cpp in Sources */,
 				E4991258174E5D8F00741B6D /* CurlFile.cpp in Sources */,
 				E499125B174E5D8F00741B6D /* DAVCommon.cpp in Sources */,
@@ -10655,6 +10970,7 @@
 				E4991274174E5D8F00741B6D /* ImageFile.cpp in Sources */,
 				E4991275174E5D8F00741B6D /* iso9660.cpp in Sources */,
 				E4991276174E5D8F00741B6D /* ISO9660Directory.cpp in Sources */,
+				68AE5BE81C92421800C4D527 /* PeripheralAddonTranslator.cpp in Sources */,
 				E4991277174E5D8F00741B6D /* ISOFile.cpp in Sources */,
 				E4991278174E5D8F00741B6D /* LibraryDirectory.cpp in Sources */,
 				E4991279174E5D8F00741B6D /* MemBufferCache.cpp in Sources */,
@@ -10745,6 +11061,7 @@
 				E49912CA174E5DA000741B6D /* DirectoryNodeRoot.cpp in Sources */,
 				E49912CB174E5DA000741B6D /* DirectoryNodeSeasons.cpp in Sources */,
 				DF1D2DEE1B6E85EE002BB9DB /* XbtDirectory.cpp in Sources */,
+				68AE5C341C9243A000C4D527 /* ControllerTranslator.cpp in Sources */,
 				E49912CC174E5DA000741B6D /* DirectoryNodeTitleMovies.cpp in Sources */,
 				E49912CD174E5DA000741B6D /* DirectoryNodeTitleMusicVideos.cpp in Sources */,
 				DFDE5D521AE5658200EE53AD /* PictureScalingAlgorithm.cpp in Sources */,
@@ -10753,6 +11070,8 @@
 				E49912D0174E5DA000741B6D /* QueryParams.cpp in Sources */,
 				E49912D1174E5DA000741B6D /* VideoDatabaseDirectory.cpp in Sources */,
 				E49912D2174E5DA000741B6D /* VirtualDirectory.cpp in Sources */,
+				68AE5BE21C92421800C4D527 /* AddonButtonMapping.cpp in Sources */,
+				68AE5BE01C92421800C4D527 /* AddonButtonMap.cpp in Sources */,
 				E49912D6174E5DA000741B6D /* ZeroconfDirectory.cpp in Sources */,
 				E49912D7174E5DA000741B6D /* ZipDirectory.cpp in Sources */,
 				E49912D8174E5DA000741B6D /* ZipFile.cpp in Sources */,
@@ -10780,6 +11099,7 @@
 				E49912EE174E5DAD00741B6D /* GUIControlProfiler.cpp in Sources */,
 				E49912EF174E5DAD00741B6D /* GUIDialog.cpp in Sources */,
 				E49912F0174E5DAD00741B6D /* GUIEditControl.cpp in Sources */,
+				68AE5BEC1C92422C00C4D527 /* PeripheralBusAddon.cpp in Sources */,
 				E49912F1174E5DAD00741B6D /* GUIFadeLabelControl.cpp in Sources */,
 				E49912F2174E5DAD00741B6D /* GUIFixedListContainer.cpp in Sources */,
 				E49912F3174E5DAD00741B6D /* GUIFont.cpp in Sources */,
@@ -10837,6 +11157,7 @@
 				E499131E174E5DAD00741B6D /* GUIWindow.cpp in Sources */,
 				E499131F174E5DAD00741B6D /* GUIWindowManager.cpp in Sources */,
 				2F4564D61970129A00396109 /* GUIFontCache.cpp in Sources */,
+				68AE5BD31C9241F800C4D527 /* InputHandling.cpp in Sources */,
 				E4991320174E5DAD00741B6D /* GUIWrappingListContainer.cpp in Sources */,
 				E4991321174E5DAD00741B6D /* imagefactory.cpp in Sources */,
 				E4991322174E5DAD00741B6D /* IWindowManagerCallback.cpp in Sources */,
@@ -10913,6 +11234,7 @@
 				E499137A174E5F0E00741B6D /* MusicInfoScanner.cpp in Sources */,
 				E499137B174E5F0E00741B6D /* MusicInfoScraper.cpp in Sources */,
 				7C8E022C1BA35D0B0072E8B2 /* GUIContainerBuiltins.cpp in Sources */,
+				68AE5BF81C92431300C4D527 /* EventScanRate.cpp in Sources */,
 				DF54F8041B6580C8000FCBA4 /* ContextMenuAddon.cpp in Sources */,
 				E4991388174E5F0E00741B6D /* MusicInfoTag.cpp in Sources */,
 				E499138A174E5F0E00741B6D /* MusicInfoTagLoaderCDDA.cpp in Sources */,
@@ -10928,6 +11250,7 @@
 				E499139A174E5F0E00741B6D /* GUIWindowVisualisation.cpp in Sources */,
 				E499139B174E5F0E00741B6D /* Album.cpp in Sources */,
 				E499139C174E5F0E00741B6D /* Artist.cpp in Sources */,
+				68AE5C0E1C92437900C4D527 /* GUIFeatureList.cpp in Sources */,
 				E499139D174E5F0E00741B6D /* GUIViewStateMusic.cpp in Sources */,
 				E499139E174E5F0E00741B6D /* MusicDatabase.cpp in Sources */,
 				E499139F174E5F0E00741B6D /* MusicDbUrl.cpp in Sources */,
@@ -11002,6 +11325,7 @@
 				7C2ED53E1C7F7A9800C04032 /* ProcessInfo.cpp in Sources */,
 				E49913DB174E5F8D00741B6D /* PictureInfoLoader.cpp in Sources */,
 				E49913DC174E5F8D00741B6D /* PictureInfoTag.cpp in Sources */,
+				68AE5BBE1C9241DF00C4D527 /* DefaultJoystick.cpp in Sources */,
 				E49913DD174E5F8D00741B6D /* PictureThumbLoader.cpp in Sources */,
 				E49913DE174E5F8D00741B6D /* SlideShowPicture.cpp in Sources */,
 				E49913DF174E5F8D00741B6D /* PlayList.cpp in Sources */,
@@ -11056,12 +11380,15 @@
 				E499140F174E5FB900741B6D /* PVRDatabase.cpp in Sources */,
 				E4991410174E5FB900741B6D /* PVRGUIInfo.cpp in Sources */,
 				E4991411174E5FB900741B6D /* PVRManager.cpp in Sources */,
+				68AE5BE41C92421800C4D527 /* AddonInputHandling.cpp in Sources */,
+				68AE5C1A1C92438E00C4D527 /* GUIAnalogStickButton.cpp in Sources */,
 				DFD7173A1C09FEC60025D964 /* DarwinUtils.mm in Sources */,
 				E4991415174E5FF000741B6D /* RenderSystemGLES.cpp in Sources */,
 				E4991416174E602700741B6D /* RenderSystem.cpp in Sources */,
 				E4991417174E603C00741B6D /* GUIControlSettings.cpp in Sources */,
 				E4991418174E603C00741B6D /* GUIDialogContentSettings.cpp in Sources */,
 				E499141A174E603C00741B6D /* GUIWindowSettings.cpp in Sources */,
+				68AE5BE61C92421800C4D527 /* PeripheralAddon.cpp in Sources */,
 				E499141B174E603C00741B6D /* GUIWindowSettingsCategory.cpp in Sources */,
 				E499141C174E603C00741B6D /* GUIWindowSettingsScreenCalibration.cpp in Sources */,
 				E499141D174E603C00741B6D /* GUIWindowTestPattern.cpp in Sources */,
@@ -11084,6 +11411,7 @@
 				E4991434174E604300741B6D /* DetectDVDType.cpp in Sources */,
 				E4991435174E604300741B6D /* IoSupport.cpp in Sources */,
 				E4991436174E604300741B6D /* MediaManager.cpp in Sources */,
+				68AE5BC21C9241DF00C4D527 /* JoystickMonitor.cpp in Sources */,
 				E4991437174E604700741B6D /* Implementation.cpp in Sources */,
 				E4991438174E604700741B6D /* Atomics.cpp in Sources */,
 				E4991439174E604700741B6D /* Event.cpp in Sources */,
@@ -11144,6 +11472,7 @@
 				E4991471174E605900741B6D /* SeekHandler.cpp in Sources */,
 				42DAC16F1A6E789E0066B4C8 /* PVRActionListener.cpp in Sources */,
 				E4991472174E605900741B6D /* SortUtils.cpp in Sources */,
+				68AE5C0C1C92437900C4D527 /* GUIControllerWindow.cpp in Sources */,
 				E4991473174E605900741B6D /* Splash.cpp in Sources */,
 				E4991474174E605900741B6D /* Stopwatch.cpp in Sources */,
 				E4991475174E605900741B6D /* StreamDetails.cpp in Sources */,
@@ -11276,10 +11605,10 @@
 				E4991568174E656E00741B6D /* WindowDialogMixin.cpp in Sources */,
 				E4991569174E656E00741B6D /* WindowXML.cpp in Sources */,
 				E499156A174E65AB00741B6D /* ButtonTranslator.cpp in Sources */,
+				68AE5C0A1C92437900C4D527 /* GUIControllerList.cpp in Sources */,
 				E499156B174E65AB00741B6D /* InertialScrollingHandler.cpp in Sources */,
 				E499156D174E65AB00741B6D /* KeyboardStat.cpp in Sources */,
 				4260D5C81B67BB8F003F6F2D /* GUIWindowSplash.cpp in Sources */,
-				E499156E174E65AB00741B6D /* SDLJoystick.cpp in Sources */,
 				E499156F174E65AC00741B6D /* XBMC_keytable.cpp in Sources */,
 				E4991574174E661400741B6D /* WinEventsIOS.mm in Sources */,
 				E4991575174E661400741B6D /* WinSystemIOS.mm in Sources */,
@@ -11378,6 +11707,8 @@
 				7CD4F7ED1C60DBC10015214B /* VideoFileItemListModifier.cpp in Sources */,
 				7CCDA16C192753E30074CF51 /* PltService.cpp in Sources */,
 				7CCDA175192753E30074CF51 /* PltSsdp.cpp in Sources */,
+				68AE5BD11C9241F800C4D527 /* FeatureHandling.cpp in Sources */,
+				68AE5BF61C92431300C4D527 /* EventScanner.cpp in Sources */,
 				7CCDA17E192753E30074CF51 /* PltStateVariable.cpp in Sources */,
 				7CCDA187192753E30074CF51 /* PltTaskManager.cpp in Sources */,
 				7CCDA190192753E30074CF51 /* PltThreadTask.cpp in Sources */,
@@ -11401,6 +11732,7 @@
 				DF923E5E1A11536A008CDB0C /* DataCacheCore.cpp in Sources */,
 				7CCDA227192753E30074CF51 /* PltMediaBrowser.cpp in Sources */,
 				7CCDA230192753E30074CF51 /* PltMediaCache.cpp in Sources */,
+				68AE5C221C92438E00C4D527 /* GUIScalarFeatureButton.cpp in Sources */,
 				7CCDA239192753E30074CF51 /* PltMediaItem.cpp in Sources */,
 				7CCDA242192753E30074CF51 /* PltMediaServer.cpp in Sources */,
 				7CCDA24B192753E30074CF51 /* PltSyncMediaBrowser.cpp in Sources */,
@@ -11413,6 +11745,7 @@
 				7CCDA7A1192756250074CF51 /* NptConsole.cpp in Sources */,
 				7CCDA7A4192756250074CF51 /* NptCrypto.cpp in Sources */,
 				7CCDA7A7192756250074CF51 /* NptDataBuffer.cpp in Sources */,
+				68AE5BA61C92412900C4D527 /* AddonCallbacksPeripheral.cpp in Sources */,
 				7CCDA7B0192756250074CF51 /* NptDebug.cpp in Sources */,
 				7CCDA7B9192756250074CF51 /* NptDigest.cpp in Sources */,
 				7CCDA7BC192756250074CF51 /* NptDynamicLibraries.cpp in Sources */,
@@ -11423,6 +11756,7 @@
 				DFD717371C09FEC60025D964 /* AutoPool.mm in Sources */,
 				7CCDA7DD192756250074CF51 /* NptList.cpp in Sources */,
 				7C8E02291BA35D0B0072E8B2 /* GUIBuiltins.cpp in Sources */,
+				68AE5C321C9243A000C4D527 /* ControllerLayout.cpp in Sources */,
 				7CCDA7E6192756250074CF51 /* NptLogging.cpp in Sources */,
 				7CCDA7E9192756250074CF51 /* NptMessaging.cpp in Sources */,
 				7CCDA7F2192756250074CF51 /* NptNetwork.cpp in Sources */,
@@ -11441,6 +11775,7 @@
 				7CCDA84F192756250074CF51 /* NptTls.cpp in Sources */,
 				7CCDA852192756250074CF51 /* NptUri.cpp in Sources */,
 				7CCDA85B192756250074CF51 /* NptUtils.cpp in Sources */,
+				68AE5C201C92438E00C4D527 /* GUIGameController.cpp in Sources */,
 				7CCDA864192756250074CF51 /* NptXml.cpp in Sources */,
 				7CCDA86D192756250074CF51 /* NptZip.cpp in Sources */,
 				B5011E4219AF3B56005ADF89 /* PosixFile.cpp in Sources */,
@@ -11456,6 +11791,7 @@
 				7CCDAC8719275CA70074CF51 /* NptBsdNetwork.cpp in Sources */,
 				7CCDAC9019275CA70074CF51 /* NptBsdResolver.cpp in Sources */,
 				7CCDAC9319275CA70074CF51 /* NptBsdSockets.cpp in Sources */,
+				68AE5C1E1C92438E00C4D527 /* GUIFeatureButton.cpp in Sources */,
 				7CCDACA819275D1F0074CF51 /* NptStdcDebug.cpp in Sources */,
 				DF29BCFB1B5D911800904347 /* GUIViewStateEventLog.cpp in Sources */,
 				7CCDACB119275D1F0074CF51 /* NptStdcEnvironment.cpp in Sources */,