diff options
| author | Lukas Rusak <lorusak@gmail.com> | 2019-11-24 15:41:07 -0800 |
|---|---|---|
| committer | Lukas Rusak <lorusak@gmail.com> | 2020-01-14 19:37:54 -0800 |
| commit | af927c17985c00a9b831e45c1441e153341276da (patch) | |
| tree | f732699c2794f3e30bc44b6963a2ad61fd99b5ec | |
| parent | 98e7dabc8e18cfe2b9f3605f33d7371b194a674f (diff) | |
SysfsUtils: move to platform/linux and rename to SysfsPath
| -rw-r--r-- | xbmc/platform/linux/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | xbmc/platform/linux/CPUInfoLinux.cpp | 3 | ||||
| -rw-r--r-- | xbmc/platform/linux/SysfsPath.cpp (renamed from xbmc/utils/SysfsUtils.cpp) | 2 | ||||
| -rw-r--r-- | xbmc/platform/linux/SysfsPath.h (renamed from xbmc/utils/SysfsUtils.h) | 0 | ||||
| -rw-r--r-- | xbmc/utils/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | xbmc/utils/SystemInfo.cpp | 3 |
6 files changed, 7 insertions, 8 deletions
diff --git a/xbmc/platform/linux/CMakeLists.txt b/xbmc/platform/linux/CMakeLists.txt index 653227d944..a36f4e82fa 100644 --- a/xbmc/platform/linux/CMakeLists.txt +++ b/xbmc/platform/linux/CMakeLists.txt @@ -1,11 +1,13 @@ set(SOURCES CPUInfoLinux.cpp MemUtils.cpp OptionalsReg.cpp + SysfsPath.cpp TimeUtils.cpp) set(HEADERS CPUInfoLinux.h OptionalsReg.h PlatformConstants.h + SysfsPath.h TimeUtils.h) if(ALSA_FOUND) diff --git a/xbmc/platform/linux/CPUInfoLinux.cpp b/xbmc/platform/linux/CPUInfoLinux.cpp index 22aa043c0e..30526d1f8d 100644 --- a/xbmc/platform/linux/CPUInfoLinux.cpp +++ b/xbmc/platform/linux/CPUInfoLinux.cpp @@ -9,9 +9,10 @@ #include "CPUInfoLinux.h" #include "utils/StringUtils.h" -#include "utils/SysfsUtils.h" #include "utils/Temperature.h" +#include "platform/linux/SysfsPath.h" + #include <fstream> #include <regex> #include <sstream> diff --git a/xbmc/utils/SysfsUtils.cpp b/xbmc/platform/linux/SysfsPath.cpp index b27ea50f53..f5b503c5a5 100644 --- a/xbmc/utils/SysfsUtils.cpp +++ b/xbmc/platform/linux/SysfsPath.cpp @@ -6,7 +6,7 @@ * See LICENSES/README.md for more information. */ -#include "SysfsUtils.h" +#include "SysfsPath.h" bool CSysfsPath::Exists() { diff --git a/xbmc/utils/SysfsUtils.h b/xbmc/platform/linux/SysfsPath.h index 499d3d4a93..499d3d4a93 100644 --- a/xbmc/utils/SysfsUtils.h +++ b/xbmc/platform/linux/SysfsPath.h diff --git a/xbmc/utils/CMakeLists.txt b/xbmc/utils/CMakeLists.txt index d13f1ae3e4..aee35f1e36 100644 --- a/xbmc/utils/CMakeLists.txt +++ b/xbmc/utils/CMakeLists.txt @@ -185,11 +185,6 @@ if(NOT CORE_SYSTEM_NAME STREQUAL windows AND NOT CORE_SYSTEM_NAME STREQUAL windo list(APPEND HEADERS GLUtils.h) endif() -if(CORE_SYSTEM_NAME STREQUAL linux) - list(APPEND SOURCES SysfsUtils.cpp) - list(APPEND HEADERS SysfsUtils.h) -endif() - if(CORE_PLATFORM_NAME_LC STREQUAL gbm) list(APPEND SOURCES EGLImage.cpp) list(APPEND HEADERS EGLImage.h) diff --git a/xbmc/utils/SystemInfo.cpp b/xbmc/utils/SystemInfo.cpp index 812d0c8e06..f7353e79d8 100644 --- a/xbmc/utils/SystemInfo.cpp +++ b/xbmc/utils/SystemInfo.cpp @@ -68,8 +68,9 @@ using namespace winrt::Windows::System::Profile; #elif defined(TARGET_FREEBSD) #include <sys/param.h> #elif defined(TARGET_LINUX) +#include "platform/linux/SysfsPath.h" + #include <linux/version.h> -#include "utils/SysfsUtils.h" #endif #include <system_error> |