diff options
| author | Sascha Montellese <sascha.montellese@gmail.com> | 2015-03-10 08:23:12 +0100 |
|---|---|---|
| committer | Sascha Montellese <sascha.montellese@gmail.com> | 2015-03-10 08:23:12 +0100 |
| commit | 4f9dba5888cddc168f044fb622799ce23934ea5a (patch) | |
| tree | c36cebbaae9055bfbe81bb58a1bc6220c011c52e /project | |
| parent | 4c3dc84b1502b360c526383f37b5acd04f8907bf (diff) | |
| parent | 0ce93d3de96a5d38fb6957fb2320a1d25cadba3c (diff) | |
Merge pull request #6629 from Montellese/regional_settings
Add short/long date formats, time formats, temperature and speed unit settings
Diffstat (limited to 'project')
| -rw-r--r-- | project/VS2010Express/XBMC.vcxproj | 8 | ||||
| -rw-r--r-- | project/VS2010Express/XBMC.vcxproj.filters | 16 |
2 files changed, 18 insertions, 6 deletions
diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj index 97fbbd6049..62ee9780d9 100644 --- a/project/VS2010Express/XBMC.vcxproj +++ b/project/VS2010Express/XBMC.vcxproj @@ -806,7 +806,6 @@ <ClCompile Include="..\..\xbmc\storage\MediaManager.cpp" /> <ClCompile Include="..\..\xbmc\storage\windows\Win32StorageProvider.cpp" /> <ClCompile Include="..\..\xbmc\SystemGlobals.cpp" /> - <ClCompile Include="..\..\xbmc\Temperature.cpp" /> <ClCompile Include="..\..\xbmc\test\TestBasicEnvironment.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> @@ -1035,7 +1034,9 @@ <ClInclude Include="..\..\xbmc\utils\params_check_macros.h" /> <ClInclude Include="..\..\xbmc\utils\ProgressJob.h" /> <ClInclude Include="..\..\xbmc\utils\RssManager.h" /> + <ClInclude Include="..\..\xbmc\utils\Speed.h" /> <ClInclude Include="..\..\xbmc\utils\StringValidation.h" /> + <ClInclude Include="..\..\xbmc\utils\Temperature.h" /> <ClInclude Include="..\..\xbmc\utils\Utf8Utils.h" /> <ClInclude Include="..\..\xbmc\utils\uXstrings.h" /> <ClInclude Include="..\..\xbmc\utils\Vector.h" /> @@ -1174,7 +1175,9 @@ <ClCompile Include="..\..\xbmc\utils\Locale.cpp" /> <ClCompile Include="..\..\xbmc\utils\ProgressJob.cpp" /> <ClCompile Include="..\..\xbmc\utils\RssManager.cpp" /> + <ClCompile Include="..\..\xbmc\utils\Speed.cpp" /> <ClCompile Include="..\..\xbmc\utils\StringValidation.cpp" /> + <ClCompile Include="..\..\xbmc\utils\Temperature.cpp" /> <ClCompile Include="..\..\xbmc\utils\test\TestHttpRangeUtils.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> @@ -2055,7 +2058,6 @@ <ClInclude Include="..\..\xbmc\storage\MediaManager.h" /> <ClInclude Include="..\..\xbmc\storage\windows\Win32StorageProvider.h" /> <ClInclude Include="..\..\xbmc\system.h" /> - <ClInclude Include="..\..\xbmc\Temperature.h" /> <ClInclude Include="..\..\xbmc\test\TestBasicEnvironment.h"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> @@ -2613,4 +2615,4 @@ </VisualStudio> </ProjectExtensions> <Import Project="$(SolutionDir)\$(ProjectFileName).targets.user" Condition="Exists('$(SolutionDir)\$(ProjectFileName).targets.user')" /> -</Project> +</Project>
\ No newline at end of file diff --git a/project/VS2010Express/XBMC.vcxproj.filters b/project/VS2010Express/XBMC.vcxproj.filters index d5d95f6d0a..12cb18fb2e 100644 --- a/project/VS2010Express/XBMC.vcxproj.filters +++ b/project/VS2010Express/XBMC.vcxproj.filters @@ -2342,7 +2342,6 @@ <ClCompile Include="..\..\xbmc\PartyModeManager.cpp" /> <ClCompile Include="..\..\xbmc\PasswordManager.cpp" /> <ClCompile Include="..\..\xbmc\SectionLoader.cpp" /> - <ClCompile Include="..\..\xbmc\Temperature.cpp" /> <ClCompile Include="..\..\xbmc\TextureCache.cpp" /> <ClCompile Include="..\..\xbmc\TextureCacheJob.cpp" /> <ClCompile Include="..\..\xbmc\TextureDatabase.cpp" /> @@ -3174,6 +3173,12 @@ <ClCompile Include="..\..\xbmc\utils\test\TestLocale.cpp"> <Filter>utils\test</Filter> </ClCompile> + <ClCompile Include="..\..\xbmc\utils\Temperature.cpp"> + <Filter>utils</Filter> + </ClCompile> + <ClCompile Include="..\..\xbmc\utils\Speed.cpp"> + <Filter>utils</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\xbmc\win32\pch.h"> @@ -5432,7 +5437,6 @@ <ClInclude Include="..\..\xbmc\PasswordManager.h" /> <ClInclude Include="..\..\xbmc\SortFileItem.h" /> <ClInclude Include="..\..\xbmc\SectionLoader.h" /> - <ClInclude Include="..\..\xbmc\Temperature.h" /> <ClInclude Include="..\..\xbmc\TextureCache.h" /> <ClInclude Include="..\..\xbmc\TextureCacheJob.h" /> <ClInclude Include="..\..\xbmc\TextureDatabase.h" /> @@ -6167,6 +6171,12 @@ <ClInclude Include="..\..\xbmc\addons\AudioDecoder.h"> <Filter>addons</Filter> </ClInclude> + <ClInclude Include="..\..\xbmc\utils\Temperature.h"> + <Filter>utils</Filter> + </ClInclude> + <ClInclude Include="..\..\xbmc\utils\Speed.h"> + <Filter>utils</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <ResourceCompile Include="..\..\xbmc\win32\XBMC_PC.rc"> @@ -6212,4 +6222,4 @@ <Filter>interfaces\swig</Filter> </CustomBuild> </ItemGroup> -</Project> +</Project>
\ No newline at end of file |