diff --git a/CMakeLists.txt b/CMakeLists.txt index f55e06d5f..a25c9ac57 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -689,7 +689,6 @@ elseif(APPLE) src/detection/processes/processes_bsd.c src/detection/sound/sound_apple.c src/detection/swap/swap_apple.c - src/detection/temps/temps_apple.c src/detection/terminalfont/terminalfont_apple.m src/detection/terminalshell/terminalshell_linux.c src/detection/terminalsize/terminalsize_linux.c @@ -705,6 +704,7 @@ elseif(APPLE) src/detection/zpool/zpool_nosupport.c src/util/apple/cf_helpers.c src/util/apple/osascript.m + src/util/apple/smc_temps.c src/util/platform/FFPlatform_unix.c src/util/binary_apple.c ) diff --git a/src/detection/battery/battery_apple.c b/src/detection/battery/battery_apple.c index 1de81b963..4f3d809b6 100644 --- a/src/detection/battery/battery_apple.c +++ b/src/detection/battery/battery_apple.c @@ -1,7 +1,7 @@ #include "fastfetch.h" #include "battery.h" #include "util/apple/cf_helpers.h" -#include "detection/temps/temps_apple.h" +#include "util/apple/smc_temps.h" #include #include diff --git a/src/detection/cpu/cpu_apple.c b/src/detection/cpu/cpu_apple.c index efdad9502..b08a8b5bc 100644 --- a/src/detection/cpu/cpu_apple.c +++ b/src/detection/cpu/cpu_apple.c @@ -1,6 +1,6 @@ #include "cpu.h" #include "common/sysctl.h" -#include "detection/temps/temps_apple.h" +#include "util/apple/smc_temps.h" #include "util/stringUtils.h" static double detectCpuTemp(const FFstrbuf* cpuName) diff --git a/src/detection/gpu/gpu_apple.c b/src/detection/gpu/gpu_apple.c index 1190a6367..5abf00409 100644 --- a/src/detection/gpu/gpu_apple.c +++ b/src/detection/gpu/gpu_apple.c @@ -1,8 +1,8 @@ #include "gpu.h" #include "common/library.h" #include "detection/cpu/cpu.h" -#include "detection/temps/temps_apple.h" #include "util/apple/cf_helpers.h" +#include "util/apple/smc_temps.h" #include diff --git a/src/detection/temps/temps_apple.c b/src/util/apple/smc_temps.c similarity index 99% rename from src/detection/temps/temps_apple.c rename to src/util/apple/smc_temps.c index c4cef7827..1f9d8179d 100644 --- a/src/detection/temps/temps_apple.c +++ b/src/util/apple/smc_temps.c @@ -1,5 +1,5 @@ #include "fastfetch.h" -#include "temps_apple.h" +#include "smc_temps.h" #include "util/stringUtils.h" #include diff --git a/src/detection/temps/temps_apple.h b/src/util/apple/smc_temps.h similarity index 95% rename from src/detection/temps/temps_apple.h rename to src/util/apple/smc_temps.h index c04b41569..0d6e104c1 100644 --- a/src/detection/temps/temps_apple.h +++ b/src/util/apple/smc_temps.h @@ -1,7 +1,6 @@ #pragma once #include "fastfetch.h" -#include "util/FFlist.h" typedef struct FFTempValue {