From bbbc903eeb47d2ad70f2d23eccf88d7ee6930eee Mon Sep 17 00:00:00 2001 From: Garrett Brown Date: Sat, 13 Dec 2014 03:38:16 -0800 Subject: Remove joystick code Joystick support will return in a following commit. Platform specific code will be isolated entirely in binary add-ons. Removal of joystick code is incomplete on Android (todo) Thanks to Tolriq for fixing broken EventServer. --- project/VS2010Express/XBMC.vcxproj | 2 -- project/VS2010Express/XBMC.vcxproj.filters | 6 ------ 2 files changed, 8 deletions(-) (limited to 'project') diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj index 1222ffc761..89b73fbe67 100644 --- a/project/VS2010Express/XBMC.vcxproj +++ b/project/VS2010Express/XBMC.vcxproj @@ -574,7 +574,6 @@ - @@ -1093,7 +1092,6 @@ - diff --git a/project/VS2010Express/XBMC.vcxproj.filters b/project/VS2010Express/XBMC.vcxproj.filters index f2aa5382a7..c6d6ac0238 100644 --- a/project/VS2010Express/XBMC.vcxproj.filters +++ b/project/VS2010Express/XBMC.vcxproj.filters @@ -2223,9 +2223,6 @@ utils - - input\windows - filesystem @@ -5352,9 +5349,6 @@ utils - - input\windows - filesystem -- cgit v1.2.3 From 1fe1a1a3a30b1e61813c13d8855ed1c6f75a4fb7 Mon Sep 17 00:00:00 2001 From: Garrett Brown Date: Sat, 10 Jan 2015 16:23:13 -0800 Subject: Joystick library Thanks to a1rwulf for fixing the joystick library build, da-anda for fixing missing joystick.xml shoulder keys, and longelf for joystick.xml. --- project/VS2010Express/XBMC.vcxproj | 21 +++++++++ project/VS2010Express/XBMC.vcxproj.filters | 69 ++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+) (limited to 'project') diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj index 89b73fbe67..90a292c7ad 100644 --- a/project/VS2010Express/XBMC.vcxproj +++ b/project/VS2010Express/XBMC.vcxproj @@ -561,6 +561,13 @@ + + + + + + + @@ -1079,6 +1086,20 @@ + + + + + + + + + + + + + + diff --git a/project/VS2010Express/XBMC.vcxproj.filters b/project/VS2010Express/XBMC.vcxproj.filters index c6d6ac0238..c0df7a9354 100644 --- a/project/VS2010Express/XBMC.vcxproj.filters +++ b/project/VS2010Express/XBMC.vcxproj.filters @@ -421,6 +421,12 @@ {c3708f40-3139-4ee9-b8f6-c6bcc22bb1c3} + + {5d8049b8-4689-4ff0-bf4f-1f0a308e5b44} + + + {80a8356f-f3be-46b5-be2e-714a42764ee1} + @@ -3328,6 +3334,27 @@ addons\binary\interfaces + + input\joysticks + + + input\joysticks + + + input\joysticks + + + input\joysticks + + + input\joysticks\generic + + + input\joysticks\generic + + + input\joysticks\generic + @@ -6434,6 +6461,48 @@ addons\binary\interfaces + + input\joysticks + + + input\joysticks + + + input\joysticks + + + input\joysticks + + + input\joysticks + + + input\joysticks + + + input\joysticks + + + input\joysticks + + + input\joysticks + + + input\joysticks + + + input\joysticks + + + input\joysticks\generic + + + input\joysticks\generic + + + input\joysticks\generic + -- cgit v1.2.3 From afec10266946bad4d83c31a5d6c1b76fdfb540d1 Mon Sep 17 00:00:00 2001 From: Garrett Brown Date: Sun, 11 Jan 2015 08:23:13 +0800 Subject: Peripheral add-ons Thanks to frostworx for fixing the peripheral add-ons build, notspiff for helping with the rebrand and montellese for the windows installer fix and VS solution fix. --- project/VS2010Express/XBMC for Windows.sln | 62 +++----------------- project/VS2010Express/XBMC.vcxproj | 25 +++++++++ project/VS2010Express/XBMC.vcxproj.filters | 84 ++++++++++++++++++++++++++++ project/Win32BuildSetup/genNsisInstaller.nsi | 1 + 4 files changed, 118 insertions(+), 54 deletions(-) (limited to 'project') diff --git a/project/VS2010Express/XBMC for Windows.sln b/project/VS2010Express/XBMC for Windows.sln index 3740952064..b6034e54e5 100644 --- a/project/VS2010Express/XBMC for Windows.sln +++ b/project/VS2010Express/XBMC for Windows.sln @@ -41,6 +41,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libKODI_audioengine", "..\. EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libKODI_inputstream", "..\..\lib\addons\library.kodi.inputstream\project\VS2010Express\libKODI_inputstream.vcxproj", "{8BC9CEB8-8B4A-11D0-8D11-00A0CFEBC942}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libKODI_peripheral", "..\..\lib\addons\library.kodi.peripheral\project\VS2010Express\libKODI_peripheral.vcxproj", "{FEA71D39-CB68-486B-A978-246E661A3F89}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug Testsuite|Win32 = Debug Testsuite|Win32 @@ -66,60 +68,6 @@ Global {FE0A91C0-E30A-47CD-8A92-A508C9292452}.Debug|Win32.Build.0 = Debug|Win32 {FE0A91C0-E30A-47CD-8A92-A508C9292452}.Release|Win32.ActiveCfg = Release|Win32 {FE0A91C0-E30A-47CD-8A92-A508C9292452}.Release|Win32.Build.0 = Release|Win32 - {3B424C94-2005-44CC-BFB1-4B6C89090732}.Debug Testsuite|Win32.ActiveCfg = Debug|Win32 - {3B424C94-2005-44CC-BFB1-4B6C89090732}.Debug Testsuite|Win32.Build.0 = Debug|Win32 - {3B424C94-2005-44CC-BFB1-4B6C89090732}.Debug|Win32.ActiveCfg = Debug|Win32 - {3B424C94-2005-44CC-BFB1-4B6C89090732}.Debug|Win32.Build.0 = Debug|Win32 - {3B424C94-2005-44CC-BFB1-4B6C89090732}.Release|Win32.ActiveCfg = Release|Win32 - {3B424C94-2005-44CC-BFB1-4B6C89090732}.Release|Win32.Build.0 = Release|Win32 - {3843C3D4-E5A6-4030-87EC-E7EE57242106}.Debug Testsuite|Win32.ActiveCfg = Debug|Win32 - {3843C3D4-E5A6-4030-87EC-E7EE57242106}.Debug Testsuite|Win32.Build.0 = Debug|Win32 - {3843C3D4-E5A6-4030-87EC-E7EE57242106}.Debug|Win32.ActiveCfg = Debug|Win32 - {3843C3D4-E5A6-4030-87EC-E7EE57242106}.Debug|Win32.Build.0 = Debug|Win32 - {3843C3D4-E5A6-4030-87EC-E7EE57242106}.Release|Win32.ActiveCfg = Release|Win32 - {3843C3D4-E5A6-4030-87EC-E7EE57242106}.Release|Win32.Build.0 = Release|Win32 - {88E7E431-3752-4D58-BCD2-A7E6A1B74247}.Debug Testsuite|Win32.ActiveCfg = Debug|Win32 - {88E7E431-3752-4D58-BCD2-A7E6A1B74247}.Debug Testsuite|Win32.Build.0 = Debug|Win32 - {88E7E431-3752-4D58-BCD2-A7E6A1B74247}.Debug|Win32.ActiveCfg = Debug|Win32 - {88E7E431-3752-4D58-BCD2-A7E6A1B74247}.Debug|Win32.Build.0 = Debug|Win32 - {88E7E431-3752-4D58-BCD2-A7E6A1B74247}.Release|Win32.ActiveCfg = Release|Win32 - {88E7E431-3752-4D58-BCD2-A7E6A1B74247}.Release|Win32.Build.0 = Release|Win32 - {145287C8-24EA-42FE-8D7D-C13D5E4B054C}.Debug Testsuite|Win32.ActiveCfg = Debug|Win32 - {145287C8-24EA-42FE-8D7D-C13D5E4B054C}.Debug Testsuite|Win32.Build.0 = Debug|Win32 - {145287C8-24EA-42FE-8D7D-C13D5E4B054C}.Debug|Win32.ActiveCfg = Debug|Win32 - {145287C8-24EA-42FE-8D7D-C13D5E4B054C}.Debug|Win32.Build.0 = Debug|Win32 - {145287C8-24EA-42FE-8D7D-C13D5E4B054C}.Release|Win32.ActiveCfg = Release|Win32 - {145287C8-24EA-42FE-8D7D-C13D5E4B054C}.Release|Win32.Build.0 = Release|Win32 - {8E5F7DBE-2E8B-4FD2-BFFE-1960CE7EDC09}.Debug Testsuite|Win32.ActiveCfg = Debug|Win32 - {8E5F7DBE-2E8B-4FD2-BFFE-1960CE7EDC09}.Debug Testsuite|Win32.Build.0 = Debug|Win32 - {8E5F7DBE-2E8B-4FD2-BFFE-1960CE7EDC09}.Debug|Win32.ActiveCfg = Debug|Win32 - {8E5F7DBE-2E8B-4FD2-BFFE-1960CE7EDC09}.Debug|Win32.Build.0 = Debug|Win32 - {8E5F7DBE-2E8B-4FD2-BFFE-1960CE7EDC09}.Release|Win32.ActiveCfg = Release|Win32 - {8E5F7DBE-2E8B-4FD2-BFFE-1960CE7EDC09}.Release|Win32.Build.0 = Release|Win32 - {783701E9-4A65-4505-97B0-39E580AA680D}.Debug Testsuite|Win32.ActiveCfg = Debug|Win32 - {783701E9-4A65-4505-97B0-39E580AA680D}.Debug Testsuite|Win32.Build.0 = Debug|Win32 - {783701E9-4A65-4505-97B0-39E580AA680D}.Debug|Win32.ActiveCfg = Debug|Win32 - {783701E9-4A65-4505-97B0-39E580AA680D}.Debug|Win32.Build.0 = Debug|Win32 - {783701E9-4A65-4505-97B0-39E580AA680D}.Release|Win32.ActiveCfg = Release|Win32 - {783701E9-4A65-4505-97B0-39E580AA680D}.Release|Win32.Build.0 = Release|Win32 - {44BF83C4-F73A-4093-A29A-11B9016318C4}.Debug Testsuite|Win32.ActiveCfg = Debug|Win32 - {44BF83C4-F73A-4093-A29A-11B9016318C4}.Debug Testsuite|Win32.Build.0 = Debug|Win32 - {44BF83C4-F73A-4093-A29A-11B9016318C4}.Debug|Win32.ActiveCfg = Debug|Win32 - {44BF83C4-F73A-4093-A29A-11B9016318C4}.Debug|Win32.Build.0 = Debug|Win32 - {44BF83C4-F73A-4093-A29A-11B9016318C4}.Release|Win32.ActiveCfg = Release|Win32 - {44BF83C4-F73A-4093-A29A-11B9016318C4}.Release|Win32.Build.0 = Release|Win32 - {8735F1ED-317D-4F7A-A512-B2BF9DAEA25A}.Debug Testsuite|Win32.ActiveCfg = Debug|Win32 - {8735F1ED-317D-4F7A-A512-B2BF9DAEA25A}.Debug Testsuite|Win32.Build.0 = Debug|Win32 - {8735F1ED-317D-4F7A-A512-B2BF9DAEA25A}.Debug|Win32.ActiveCfg = Debug|Win32 - {8735F1ED-317D-4F7A-A512-B2BF9DAEA25A}.Debug|Win32.Build.0 = Debug|Win32 - {8735F1ED-317D-4F7A-A512-B2BF9DAEA25A}.Release|Win32.ActiveCfg = Release|Win32 - {8735F1ED-317D-4F7A-A512-B2BF9DAEA25A}.Release|Win32.Build.0 = Release|Win32 - {96798038-06CE-4382-BD5B-F9C366724DEB}.Debug Testsuite|Win32.ActiveCfg = Debug|Win32 - {96798038-06CE-4382-BD5B-F9C366724DEB}.Debug Testsuite|Win32.Build.0 = Debug|Win32 - {96798038-06CE-4382-BD5B-F9C366724DEB}.Debug|Win32.ActiveCfg = Debug|Win32 - {96798038-06CE-4382-BD5B-F9C366724DEB}.Debug|Win32.Build.0 = Debug|Win32 - {96798038-06CE-4382-BD5B-F9C366724DEB}.Release|Win32.ActiveCfg = Release|Win32 - {96798038-06CE-4382-BD5B-F9C366724DEB}.Release|Win32.Build.0 = Release|Win32 {AD20A3E2-09CB-42DB-9A70-27F7CDC886CE}.Debug Testsuite|Win32.ActiveCfg = Release (DLL)|Win32 {AD20A3E2-09CB-42DB-9A70-27F7CDC886CE}.Debug Testsuite|Win32.Build.0 = Release (DLL)|Win32 {AD20A3E2-09CB-42DB-9A70-27F7CDC886CE}.Debug|Win32.ActiveCfg = Debug (DLL)|Win32 @@ -198,6 +146,12 @@ Global {8BC9CEB8-8B4A-11D0-8D11-00A0CFEBC942}.Debug|Win32.ActiveCfg = Debug|Win32 {8BC9CEB8-8B4A-11D0-8D11-00A0CFEBC942}.Debug|Win32.Build.0 = Debug|Win32 {8BC9CEB8-8B4A-11D0-8D11-00A0CFEBC942}.Release|Win32.ActiveCfg = Release|Win32 + {FEA71D39-CB68-486B-A978-246E661A3F89}.Debug Testsuite|Win32.ActiveCfg = Debug|Win32 + {FEA71D39-CB68-486B-A978-246E661A3F89}.Debug Testsuite|Win32.Build.0 = Debug|Win32 + {FEA71D39-CB68-486B-A978-246E661A3F89}.Debug|Win32.ActiveCfg = Debug|Win32 + {FEA71D39-CB68-486B-A978-246E661A3F89}.Debug|Win32.Build.0 = Debug|Win32 + {FEA71D39-CB68-486B-A978-246E661A3F89}.Release|Win32.ActiveCfg = Release|Win32 + {FEA71D39-CB68-486B-A978-246E661A3F89}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj index 90a292c7ad..a07da4f1b9 100644 --- a/project/VS2010Express/XBMC.vcxproj +++ b/project/VS2010Express/XBMC.vcxproj @@ -195,6 +195,7 @@ + @@ -678,6 +679,15 @@ + + + + + + + + + true @@ -940,9 +950,11 @@ + + @@ -951,6 +963,10 @@ + + + + @@ -1187,6 +1203,15 @@ + + + + + + + + + diff --git a/project/VS2010Express/XBMC.vcxproj.filters b/project/VS2010Express/XBMC.vcxproj.filters index c0df7a9354..741cb0ad58 100644 --- a/project/VS2010Express/XBMC.vcxproj.filters +++ b/project/VS2010Express/XBMC.vcxproj.filters @@ -427,6 +427,15 @@ {80a8356f-f3be-46b5-be2e-714a42764ee1} + + {15c34cc2-9101-4038-9df4-4357d83a9d0b} + + + {6b33e5ae-5edf-4c33-b87f-3ee9115eb01d} + + + {bc7eb8ab-3f2e-4346-8546-7243b658fa30} + @@ -3355,6 +3364,36 @@ input\joysticks\generic + + peripherals\addons + + + peripherals\addons + + + peripherals\addons + + + peripherals\addons + + + peripherals\addons + + + peripherals\bus\virtual + + + peripherals\devices + + + peripherals + + + peripherals + + + addons\binary\interfaces\api1\Peripheral + @@ -6503,6 +6542,51 @@ input\joysticks\generic + + addons + + + peripherals\addons + + + peripherals\addons + + + peripherals\addons + + + peripherals\addons + + + peripherals\addons + + + peripherals\bus\virtual + + + peripherals\devices + + + peripherals + + + peripherals + + + addons\binary\interfaces\api1\Peripheral + + + addons\include + + + addons\include + + + addons\include + + + addons\include + diff --git a/project/Win32BuildSetup/genNsisInstaller.nsi b/project/Win32BuildSetup/genNsisInstaller.nsi index ccd74513fd..75ddeba04e 100644 --- a/project/Win32BuildSetup/genNsisInstaller.nsi +++ b/project/Win32BuildSetup/genNsisInstaller.nsi @@ -223,6 +223,7 @@ Section "${APP_NAME}" SecAPP File "${app_root}\application\*.*" SetOutPath "$INSTDIR\addons" File /r "${app_root}\application\addons\*.*" + File /r "${app_root}\addons\peripheral.*" SetOutPath "$INSTDIR\media" File /r "${app_root}\application\media\*.*" SetOutPath "$INSTDIR\system" -- cgit v1.2.3 From f87753740a2dea3eacd68ad94291bd0cce924f3b Mon Sep 17 00:00:00 2001 From: Garrett Brown Date: Wed, 18 Feb 2015 17:30:52 -0800 Subject: Controller add-ons --- project/VS2010Express/XBMC.vcxproj | 10 +++++++++ project/VS2010Express/XBMC.vcxproj.filters | 36 ++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) (limited to 'project') diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj index a07da4f1b9..574e4470f2 100644 --- a/project/VS2010Express/XBMC.vcxproj +++ b/project/VS2010Express/XBMC.vcxproj @@ -472,6 +472,10 @@ + + + + @@ -1089,6 +1093,12 @@ + + + + + + diff --git a/project/VS2010Express/XBMC.vcxproj.filters b/project/VS2010Express/XBMC.vcxproj.filters index 741cb0ad58..2d7875c30c 100644 --- a/project/VS2010Express/XBMC.vcxproj.filters +++ b/project/VS2010Express/XBMC.vcxproj.filters @@ -436,6 +436,12 @@ {bc7eb8ab-3f2e-4346-8546-7243b658fa30} + + {336d29fc-9a49-40a8-9295-a8d1062c540c} + + + {d0ae0c22-0869-416b-92c7-aa1dc14a58be} + @@ -3394,6 +3400,18 @@ addons\binary\interfaces\api1\Peripheral + + games\controllers + + + games\controllers + + + games\controllers + + + games\controllers + @@ -6587,6 +6605,24 @@ addons\include + + games\controllers + + + games\controllers + + + games\controllers + + + games\controllers + + + games\controllers + + + games\controllers + -- cgit v1.2.3 From fd95e8ee4d29305de546d6561d119bbf2aef3daa Mon Sep 17 00:00:00 2001 From: Garrett Brown Date: Sat, 12 Dec 2015 04:46:17 -0800 Subject: Kodi input This adds a fallback input handler to all joystick peripherals. If a joystick event isn't handled, it will be dispatched to Kodi through this class. --- project/VS2010Express/XBMC.vcxproj | 2 ++ project/VS2010Express/XBMC.vcxproj.filters | 6 ++++++ 2 files changed, 8 insertions(+) (limited to 'project') diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj index 574e4470f2..14aaefe977 100644 --- a/project/VS2010Express/XBMC.vcxproj +++ b/project/VS2010Express/XBMC.vcxproj @@ -393,6 +393,7 @@ + @@ -1079,6 +1080,7 @@ + diff --git a/project/VS2010Express/XBMC.vcxproj.filters b/project/VS2010Express/XBMC.vcxproj.filters index 2d7875c30c..bc07d7c47c 100644 --- a/project/VS2010Express/XBMC.vcxproj.filters +++ b/project/VS2010Express/XBMC.vcxproj.filters @@ -3412,6 +3412,9 @@ games\controllers + + input\joysticks + @@ -6623,6 +6626,9 @@ games\controllers + + input\joysticks + -- cgit v1.2.3 From 4b35de5cdf08fd7502dc4780f75d689a3900f07e Mon Sep 17 00:00:00 2001 From: Garrett Brown Date: Sat, 12 Dec 2015 04:34:57 -0800 Subject: Controller configuration window Thanks to hitcher for the skinning work and Montellese for some string fixes. --- project/VS2010Express/XBMC.vcxproj | 20 +++++++++ project/VS2010Express/XBMC.vcxproj.filters | 68 +++++++++++++++++++++++++++++- 2 files changed, 87 insertions(+), 1 deletion(-) (limited to 'project') diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj index 14aaefe977..a9eac26e74 100644 --- a/project/VS2010Express/XBMC.vcxproj +++ b/project/VS2010Express/XBMC.vcxproj @@ -477,6 +477,15 @@ + + + + + + + + + @@ -1101,6 +1110,17 @@ + + + + + + + + + + + diff --git a/project/VS2010Express/XBMC.vcxproj.filters b/project/VS2010Express/XBMC.vcxproj.filters index bc07d7c47c..6bf5c84c34 100644 --- a/project/VS2010Express/XBMC.vcxproj.filters +++ b/project/VS2010Express/XBMC.vcxproj.filters @@ -442,6 +442,12 @@ {d0ae0c22-0869-416b-92c7-aa1dc14a58be} + + {891f4e3d-e135-4ea9-8571-2b6ad3b1622d} + + + {9e3dd585-08e1-4dae-bc21-05e49697ef94} + @@ -3415,6 +3421,33 @@ input\joysticks + + games\controllers\guicontrols + + + games\controllers\windows + + + games\controllers\windows + + + games\controllers\windows + + + games\controllers\windows + + + games\controllers\guicontrols + + + games\controllers\guicontrols + + + games\controllers\guicontrols + + + games\controllers\guicontrols + @@ -6629,6 +6662,39 @@ input\joysticks + + games\controllers\guicontrols + + + games\controllers\windows + + + games\controllers\windows + + + games\controllers\windows + + + games\controllers\windows + + + games\controllers\windows + + + games\controllers\windows + + + games\controllers\guicontrols + + + games\controllers\guicontrols + + + games\controllers\guicontrols + + + games\controllers\guicontrols + @@ -6715,4 +6781,4 @@ shaders - \ No newline at end of file + -- cgit v1.2.3 From fa841d8cacc319ee1e9f1d4bd6fa3ec3a5ef3203 Mon Sep 17 00:00:00 2001 From: Garrett Brown Date: Sat, 6 Feb 2016 11:47:27 -0800 Subject: Reduce file name length --- project/VS2010Express/XBMC.vcxproj | 32 +++++----- project/VS2010Express/XBMC.vcxproj.filters | 96 +++++++++++++++--------------- 2 files changed, 64 insertions(+), 64 deletions(-) (limited to 'project') diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj index a9eac26e74..f2c0bec951 100644 --- a/project/VS2010Express/XBMC.vcxproj +++ b/project/VS2010Express/XBMC.vcxproj @@ -394,6 +394,9 @@ + + + @@ -577,9 +580,6 @@ - - - @@ -693,9 +693,9 @@ - - - + + + @@ -1090,6 +1090,13 @@ + + + + + + + @@ -1135,13 +1142,6 @@ - - - - - - - @@ -1235,9 +1235,9 @@ - - - + + + diff --git a/project/VS2010Express/XBMC.vcxproj.filters b/project/VS2010Express/XBMC.vcxproj.filters index 6bf5c84c34..c14221bed6 100644 --- a/project/VS2010Express/XBMC.vcxproj.filters +++ b/project/VS2010Express/XBMC.vcxproj.filters @@ -3367,27 +3367,9 @@ input\joysticks - - input\joysticks\generic - - - input\joysticks\generic - - - input\joysticks\generic - peripherals\addons - - peripherals\addons - - - peripherals\addons - - - peripherals\addons - peripherals\addons @@ -3448,6 +3430,24 @@ games\controllers\guicontrols + + input\joysticks\generic + + + input\joysticks\generic + + + input\joysticks\generic + + + peripherals\addons + + + peripherals\addons + + + peripherals\addons + @@ -6557,18 +6557,6 @@ input\joysticks - - input\joysticks - - - input\joysticks - - - input\joysticks - - - input\joysticks - input\joysticks @@ -6587,30 +6575,12 @@ input\joysticks - - input\joysticks\generic - - - input\joysticks\generic - - - input\joysticks\generic - addons peripherals\addons - - peripherals\addons - - - peripherals\addons - - - peripherals\addons - peripherals\addons @@ -6695,6 +6665,36 @@ games\controllers\guicontrols + + input\joysticks\generic + + + input\joysticks\generic + + + input\joysticks\generic + + + input\joysticks + + + input\joysticks + + + input\joysticks + + + input\joysticks + + + peripherals\addons + + + peripherals\addons + + + peripherals\addons + -- cgit v1.2.3 From e2a9c00a3fc0b640006ff9067299d94e77f92553 Mon Sep 17 00:00:00 2001 From: Christian Fetzer Date: Wed, 9 Mar 2016 08:13:16 +0100 Subject: [cmake] Controller input --- project/cmake/CMakeLists.txt | 1 + project/cmake/installdata/addon-bindings.txt | 8 +++++--- project/cmake/treedata/android/subdirs.txt | 1 + project/cmake/treedata/common/addons.txt | 1 + project/cmake/treedata/common/games.txt | 3 +++ project/cmake/treedata/common/peripherals.txt | 2 ++ project/cmake/treedata/common/subdirs.txt | 3 +++ project/cmake/treedata/optional/common/cec.txt | 1 - 8 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 project/cmake/treedata/common/games.txt delete mode 100644 project/cmake/treedata/optional/common/cec.txt (limited to 'project') diff --git a/project/cmake/CMakeLists.txt b/project/cmake/CMakeLists.txt index 03b37525b6..d58aa3cba4 100644 --- a/project/cmake/CMakeLists.txt +++ b/project/cmake/CMakeLists.txt @@ -280,6 +280,7 @@ core_link_library(XBMC_codec addons/library.xbmc.codec/libXBMC_codec) core_link_library(KODI_guilib addons/library.kodi.guilib/libKODI_guilib) core_link_library(KODI_adsp addons/library.kodi.adsp/libKODI_adsp) core_link_library(XBMC_pvr addons/library.xbmc.pvr/libXBMC_pvr) +core_link_library(KODI_peripheral addons/library.kodi.peripheral/libKODI_peripheral) file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/system/players/VideoPlayer) add_custom_target(wrap-libraries ALL DEPENDS ${WRAP_FILES}) diff --git a/project/cmake/installdata/addon-bindings.txt b/project/cmake/installdata/addon-bindings.txt index 5b6fee77d0..61d2bc1cfa 100644 --- a/project/cmake/installdata/addon-bindings.txt +++ b/project/cmake/installdata/addon-bindings.txt @@ -13,6 +13,10 @@ xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_epg_types.h xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_dll.h xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_inputstream_types.h xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_vfs_types.h +xbmc/addons/kodi-addon-dev-kit/include/kodi_peripheral_callbacks.h +xbmc/addons/kodi-addon-dev-kit/include/kodi_peripheral_dll.h +xbmc/addons/kodi-addon-dev-kit/include/kodi_peripheral_types.h +xbmc/addons/kodi-addon-dev-kit/include/kodi_peripheral_utils.hpp xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_dll.h xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_types.h xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_scr_dll.h @@ -24,8 +28,6 @@ xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_audioengine.h xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_adsp.h xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_guilib.h xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_inputstream.h +xbmc/addons/kodi-addon-dev-kit-include/kodi/libKODI_peripheral.h xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_pvr.h xbmc/addons/kodi-addon-dev-kit/include/kodi/libXBMC_codec.h -xbmc/cores/VideoPlayer/DVDDemuxers/DVDDemuxPacket.h -xbmc/cores/AudioEngine/Utils/AEChannelData.h -xbmc/filesystem/IFileTypes.h diff --git a/project/cmake/treedata/android/subdirs.txt b/project/cmake/treedata/android/subdirs.txt index 1c75fa636b..599017c539 100644 --- a/project/cmake/treedata/android/subdirs.txt +++ b/project/cmake/treedata/android/subdirs.txt @@ -3,6 +3,7 @@ xbmc/input/touch input/touch xbmc/input/touch/generic input/touch/generic xbmc/network/linux network/linux xbmc/peripherals/bus/linux peripherals/bus/linux +xbmc/peripherals/bus/android peripherals/bus/android xbmc/powermanagement/android powermanagement/android xbmc/storage/android storage/android xbmc/filesystem/posix filesystem/posix diff --git a/project/cmake/treedata/common/addons.txt b/project/cmake/treedata/common/addons.txt index 29b79903da..76410b7ed6 100644 --- a/project/cmake/treedata/common/addons.txt +++ b/project/cmake/treedata/common/addons.txt @@ -2,6 +2,7 @@ lib/addons/library.kodi.adsp KODI_adsp lib/addons/library.kodi.audioengine KODI_audioengine lib/addons/library.kodi.guilib KODI_guilib lib/addons/library.kodi.inputstream KODI_inputstream +lib/addons/library.kodi.peripheral KODI_peripheral lib/addons/library.xbmc.addon XBMC_addon lib/addons/library.xbmc.codec XBMC_codec lib/addons/library.xbmc.pvr XBMC_pvr diff --git a/project/cmake/treedata/common/games.txt b/project/cmake/treedata/common/games.txt new file mode 100644 index 0000000000..e4e8b890c6 --- /dev/null +++ b/project/cmake/treedata/common/games.txt @@ -0,0 +1,3 @@ +xbmc/games/controllers games/controllers +xbmc/games/controllers/guicontrols games/controllers/guicontrols +xbmc/games/controllers/windows games/controllers/windows diff --git a/project/cmake/treedata/common/peripherals.txt b/project/cmake/treedata/common/peripherals.txt index e6d928370c..903b5378e0 100644 --- a/project/cmake/treedata/common/peripherals.txt +++ b/project/cmake/treedata/common/peripherals.txt @@ -1,4 +1,6 @@ xbmc/peripherals peripherals +xbmc/peripherals/addons peripherals/addons xbmc/peripherals/bus peripherals/bus +xbmc/peripherals/bus/virtual peripherals/bus/virtual xbmc/peripherals/devices peripherals/devices xbmc/peripherals/dialogs peripherals/dialogs diff --git a/project/cmake/treedata/common/subdirs.txt b/project/cmake/treedata/common/subdirs.txt index 591d6fde72..c2828e0f56 100644 --- a/project/cmake/treedata/common/subdirs.txt +++ b/project/cmake/treedata/common/subdirs.txt @@ -7,6 +7,7 @@ xbmc/addons/binary/interfaces/api1/AudioEngine api1AddonCallbacks_AudioEngine xbmc/addons/binary/interfaces/api1/Codec api1AddonCallbacks_Codec xbmc/addons/binary/interfaces/api1/GUI api1AddonCallbacks_GUI xbmc/addons/binary/interfaces/api1/InputStream api1AddonCallbacks_InputStream +xbmc/addons/binary/interfaces/api1/Peripheral api1AddonCallbacks_Peripheral xbmc/addons/binary/interfaces/api1/PVR api1AddonCallbacks_PVR xbmc/commons commons xbmc/cdrip cdrip @@ -15,6 +16,8 @@ xbmc/dialogs dialogs xbmc/epg epg xbmc/guilib guilib xbmc/input input +xbmc/input/joysticks input/joysticks +xbmc/input/joysticks/generic input/joysticks/generic xbmc/listproviders listproviders xbmc/media media xbmc/messaging messaging diff --git a/project/cmake/treedata/optional/common/cec.txt b/project/cmake/treedata/optional/common/cec.txt deleted file mode 100644 index 19cd7f7eb0..0000000000 --- a/project/cmake/treedata/optional/common/cec.txt +++ /dev/null @@ -1 +0,0 @@ -xbmc/peripherals/bus/virtual peripherals/bus/virtual # CEC -- cgit v1.2.3