mirror of
https://github.com/Dr-Noob/cpufetch.git
synced 2026-03-25 07:50:40 +01:00
[v1.05] Move sysctl from ARM-specific to common (#251)
This commit is contained in:
4
Makefile
4
Makefile
@@ -43,8 +43,8 @@ ifneq ($(OS),Windows_NT)
|
|||||||
CFLAGS += -DARCH_ARM -Wno-unused-parameter -std=c99 -fstack-protector-all
|
CFLAGS += -DARCH_ARM -Wno-unused-parameter -std=c99 -fstack-protector-all
|
||||||
|
|
||||||
ifeq ($(os), Darwin)
|
ifeq ($(os), Darwin)
|
||||||
SOURCE += $(SRC_DIR)sysctl.c
|
SOURCE += $(COMMON_SRC)sysctl.c
|
||||||
HEADERS += $(SRC_DIR)sysctl.h
|
HEADERS += $(COMMON_SRC)sysctl.h
|
||||||
endif
|
endif
|
||||||
else ifeq ($(arch), $(filter $(arch), riscv64 riscv32))
|
else ifeq ($(arch), $(filter $(arch), riscv64 riscv32))
|
||||||
SRC_DIR=src/riscv/
|
SRC_DIR=src/riscv/
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
#include <asm/hwcap.h>
|
#include <asm/hwcap.h>
|
||||||
#include "../common/freq.h"
|
#include "../common/freq.h"
|
||||||
#elif defined __APPLE__ || __MACH__
|
#elif defined __APPLE__ || __MACH__
|
||||||
#include "sysctl.h"
|
#include "../common/sysctl.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "../common/global.h"
|
#include "../common/global.h"
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
#include "../common/pci.h"
|
#include "../common/pci.h"
|
||||||
|
|
||||||
#if defined(__APPLE__) || defined(__MACH__)
|
#if defined(__APPLE__) || defined(__MACH__)
|
||||||
#include "sysctl.h"
|
#include "../common/sysctl.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define NA -1
|
#define NA -1
|
||||||
|
|||||||
@@ -4,8 +4,8 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
|
||||||
#include "../common/global.h"
|
#include "global.h"
|
||||||
#include "../common/cpu.h"
|
#include "cpu.h"
|
||||||
|
|
||||||
uint32_t get_sys_info_by_name(char* name) {
|
uint32_t get_sys_info_by_name(char* name) {
|
||||||
size_t size = 0;
|
size_t size = 0;
|
||||||
Reference in New Issue
Block a user