diff options
| author | tamland <thomas.amland@gmail.com> | 2015-04-18 13:18:53 +0200 |
|---|---|---|
| committer | tamland <thomas.amland@gmail.com> | 2015-04-18 13:18:53 +0200 |
| commit | 456eade6c52b7fe60aa5778d144d4eb396697a36 (patch) | |
| tree | 3164b4a339afc8d13bdcb0ac309c173c95003dc0 /project | |
| parent | d81fd7161a5bb3f481be71d6c4c3dcc00dbd6bf4 (diff) | |
| parent | 78de2fdacfd3e94ba12fa6da78a7da219239070c (diff) | |
Merge pull request #6557 from tamland/uisound_addons
UI sounds addons
Diffstat (limited to 'project')
| -rw-r--r-- | project/VS2010Express/XBMC.vcxproj | 2 | ||||
| -rw-r--r-- | project/VS2010Express/XBMC.vcxproj.filters | 6 | ||||
| -rw-r--r-- | project/Win32BuildSetup/BuildSetup.bat | 1 | ||||
| -rw-r--r-- | project/Win32BuildSetup/genNsisInstaller.nsi | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj index 35e9b41898..cb64dd5df2 100644 --- a/project/VS2010Express/XBMC.vcxproj +++ b/project/VS2010Express/XBMC.vcxproj @@ -189,6 +189,7 @@ <ClCompile Include="..\..\xbmc\addons\Repository.cpp" /> <ClCompile Include="..\..\xbmc\addons\Service.cpp" /> <ClCompile Include="..\..\xbmc\addons\Skin.cpp" /> + <ClCompile Include="..\..\xbmc\addons\UISoundsResource.cpp" /> <ClCompile Include="..\..\xbmc\addons\Webinterface.cpp" /> <ClCompile Include="..\..\xbmc\Application.cpp" /> <ClCompile Include="..\..\xbmc\ApplicationMessenger.cpp" /> @@ -819,6 +820,7 @@ <ClInclude Include="..\..\xbmc\addons\AudioDecoder.h" /> <ClInclude Include="..\..\xbmc\addons\ContextItemAddon.h" /> <ClInclude Include="..\..\xbmc\addons\Webinterface.h" /> + <ClInclude Include="..\..\xbmc\addons\UISoundsResource.h" /> <ClInclude Include="..\..\xbmc\addons\LanguageResource.h" /> <ClInclude Include="..\..\xbmc\addons\Resource.h" /> <ClInclude Include="..\..\xbmc\ApplicationPlayer.h" /> diff --git a/project/VS2010Express/XBMC.vcxproj.filters b/project/VS2010Express/XBMC.vcxproj.filters index 3ec9ae3032..741d3d4f25 100644 --- a/project/VS2010Express/XBMC.vcxproj.filters +++ b/project/VS2010Express/XBMC.vcxproj.filters @@ -3056,6 +3056,9 @@ <ClCompile Include="..\..\xbmc\addons\LanguageResource.cpp"> <Filter>addons</Filter> </ClCompile> + <ClCompile Include="..\..\xbmc\addons\UISoundsResource.cpp"> + <Filter>addons</Filter> + </ClCompile> <ClCompile Include="..\..\xbmc\filesystem\ResourceFile.cpp"> <Filter>filesystem</Filter> </ClCompile> @@ -5941,6 +5944,9 @@ <ClInclude Include="..\..\xbmc\addons\LanguageResource.h"> <Filter>addons</Filter> </ClInclude> + <ClInclude Include="..\..\xbmc\addons\UISoundsResource.h"> + <Filter>addons</Filter> + </ClInclude> <ClInclude Include="..\..\xbmc\filesystem\ResourceFile.h"> <Filter>filesystem</Filter> </ClInclude> diff --git a/project/Win32BuildSetup/BuildSetup.bat b/project/Win32BuildSetup/BuildSetup.bat index 19d3f15879..50ad49f490 100644 --- a/project/Win32BuildSetup/BuildSetup.bat +++ b/project/Win32BuildSetup/BuildSetup.bat @@ -209,7 +209,6 @@ set WORKSPACE=%CD%\..\.. xcopy ..\..\addons BUILD_WIN32\application\addons /E /Q /I /Y /EXCLUDE:exclude.txt > NUL xcopy ..\..\system BUILD_WIN32\application\system /E /Q /I /Y /EXCLUDE:exclude.txt > NUL xcopy ..\..\media BUILD_WIN32\application\media /E /Q /I /Y /EXCLUDE:exclude.txt > NUL - xcopy ..\..\sounds BUILD_WIN32\application\sounds /E /Q /I /Y /EXCLUDE:exclude.txt > NUL SET build_path=%CD% IF %buildbinaryaddons%==true ( diff --git a/project/Win32BuildSetup/genNsisInstaller.nsi b/project/Win32BuildSetup/genNsisInstaller.nsi index d030bcd528..7c31a5af22 100644 --- a/project/Win32BuildSetup/genNsisInstaller.nsi +++ b/project/Win32BuildSetup/genNsisInstaller.nsi @@ -226,8 +226,6 @@ Section "${APP_NAME}" SecAPP File /r "${app_root}\application\addons\*.*" SetOutPath "$INSTDIR\media" File /r "${app_root}\application\media\*.*" - SetOutPath "$INSTDIR\sounds" - File /r "${app_root}\application\sounds\*.*" SetOutPath "$INSTDIR\system" ; remove leftover from old Kodi installation ${If} ${FileExists} "$INSTDIR\system\webserver" @@ -342,7 +340,6 @@ Section "Uninstall" RMDir /r "$INSTDIR\addons" RMDir /r "$INSTDIR\language" RMDir /r "$INSTDIR\media" - RMDir /r "$INSTDIR\sounds" RMDir /r "$INSTDIR\system" RMDir /r "$INSTDIR\userdata" Delete "$INSTDIR\*.*" |