thelilfrog/cpufetch
1
0
Fork 0
mirror of https://github.com/Dr-Noob/cpufetch.git synced 2026-03-25 07:50:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

[v0.94] Fix compilation issues

Browse Source
This commit is contained in:
Dr-Noob
2020-12-05 11:56:40 +01:00
parent f68c81395b
commit 5b9a9e90d0
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@@ -1,14 +1,14 @@
CXX=gcc CXX=gcc
CXXFLAGS=-Wall -Wextra -Werror -pedantic -fstack-protector-all -pedantic -std=c99 CXXFLAGS=-Wall -Wextra -Werror -pedantic -fstack-protector-all -pedantic -std=c99
SANITY_FLAGS=-Wfloat-equal -Wshadow -Wpointer-arith -Wno-stringop-truncation SANITY_FLAGS=-Wfloat-equal -Wshadow -Wpointer-arith
SRC_COMMON=src/common/ SRC_COMMON=src/common/
COMMON_SRC = $(SRC_COMMON)main.c $(SRC_COMMON)cpu.c $(SRC_COMMON)udev.c $(SRC_COMMON)printer.c $(SRC_COMMON)args.c $(SRC_COMMON)global.c COMMON_SRC = $(SRC_COMMON)main.c $(SRC_COMMON)cpu.c $(SRC_COMMON)udev.c $(SRC_COMMON)printer.c $(SRC_COMMON)args.c $(SRC_COMMON)global.c
COMMON_HDR = $(SRC_COMMON)ascii.h $(SRC_COMMON)cpu.h $(SRC_COMMON)udev.h $(SRC_COMMON)printer.h $(SRC_COMMON)args.h $(SRC_COMMON)global.h COMMON_HDR = $(SRC_COMMON)ascii.h $(SRC_COMMON)cpu.h $(SRC_COMMON)udev.h $(SRC_COMMON)printer.h $(SRC_COMMON)args.h $(SRC_COMMON)global.h
ifneq ($(OS),Windows_NT) ifneq ($(OS),Windows_NT)
arch := $(shell uname -m) arch := $(shell uname -m)
ifeq ($(arch), x86_64) ifeq ($(arch), x86_64)
SRC_DIR=src/x86/ SRC_DIR=src/x86/
@@ -21,8 +21,8 @@ ifneq ($(OS),Windows_NT)
HEADERS += $(COMMON_HDR) $(SRC_DIR)midr.h $(SRC_DIR)uarch.h $(SRC_DIR)soc.h $(SRC_DIR)udev.c $(SRC_DIR)socs.h HEADERS += $(COMMON_HDR) $(SRC_DIR)midr.h $(SRC_DIR)uarch.h $(SRC_DIR)soc.h $(SRC_DIR)udev.c $(SRC_DIR)socs.h
CXXFLAGS += -DARCH_ARM -Wno-unused-parameter CXXFLAGS += -DARCH_ARM -Wno-unused-parameter
endif endif
OUTPUT=cpufetch OUTPUT=cpufetch
else else
# Assume x86_64 # Assume x86_64
SRC_DIR=src/x86/ SRC_DIR=src/x86/
@@ -36,7 +36,7 @@ endif
all: $(OUTPUT) all: $(OUTPUT)
debug: CXXFLAGS += -g -O0 debug: CXXFLAGS += -g -O0
debug: $(OUTPUT) debug: $(OUTPUT)
release: CXXFLAGS += -static -O3 release: CXXFLAGS += -static -O3
release: $(OUTPUT) release: $(OUTPUT)
@@ -49,7 +49,7 @@ run: $(OUTPUT)
clean: clean:
@rm $(OUTPUT) @rm $(OUTPUT)
install: $(OUTPUT) install: $(OUTPUT)
install -Dm755 "cpufetch" "/usr/bin/cpufetch" install -Dm755 "cpufetch" "/usr/bin/cpufetch"
install -Dm644 "LICENSE" "/usr/share/licenses/cpufetch-git/LICENSE" install -Dm644 "LICENSE" "/usr/share/licenses/cpufetch-git/LICENSE"

2
src/arm/socs.h
View File

@@ -242,7 +242,7 @@ inline static VENDOR get_soc_vendor_from_soc(SOC soc) {
else if(soc >= SOC_HISILICON_3620 && soc <= SOC_HISILICON_3690) return SOC_VENDOR_KIRIN; else if(soc >= SOC_HISILICON_3620 && soc <= SOC_HISILICON_3690) return SOC_VENDOR_KIRIN;
else if(soc >= SOC_EXYNOS_3475 && soc <= SOC_EXYNOS_880) return SOC_VENDOR_EXYNOS; else if(soc >= SOC_EXYNOS_3475 && soc <= SOC_EXYNOS_880) return SOC_VENDOR_EXYNOS;
else if(soc >= SOC_MTK_MT6873 && soc <= SOC_MTK_MT8783) return SOC_VENDOR_MEDIATEK; else if(soc >= SOC_MTK_MT6873 && soc <= SOC_MTK_MT8783) return SOC_VENDOR_MEDIATEK;
else if(soc >= SOC_SNAPD_MSM7627A && soc <= SOC_SNAPD_SM8250_AB) return SOC_VENDOR_SNAPDRAGON; else if(soc >= SOC_SNAPD_QSD8650 && soc <= SOC_SNAPD_SM8350) return SOC_VENDOR_SNAPDRAGON;
return SOC_VENDOR_UNKNOWN; return SOC_VENDOR_UNKNOWN;
} }

2
src/common/printer.c
View File

@@ -326,7 +326,7 @@ struct ascii* set_ascii(VENDOR vendor, STYLE style, struct colors* cs) {
#endif #endif
for(int i=0; i < NUMBER_OF_LINES; i++) for(int i=0; i < NUMBER_OF_LINES; i++)
strncpy(art->art[i], tmp + i*LINE_SIZE, LINE_SIZE); memcpy(art->art[i], tmp + i*LINE_SIZE, LINE_SIZE);
return art; return art;
} }