fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-09-12 10:22:12 +02:00
Code Issues Packages Projects Releases 10 Wiki Activity

Global: fix build on Windows

Browse Source
This commit is contained in:
李通洲
2024-08-20 23:52:29 +08:00
parent 543eed9a53
commit dd2d343630
7 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+6 -4
View File
@@ -482,7 +482,7 @@ if(LINUX)
src/detection/wmtheme/wmtheme_linux.c
src/detection/camera/camera_linux.c
src/util/platform/FFPlatform_unix.c
src/util/linux/elf.c
src/util/binary.c
)
elseif(ANDROID)
list(APPEND LIBFASTFETCH_SRC
@@ -544,7 +544,7 @@ elseif(ANDROID)
src/detection/wmtheme/wmtheme_nosupport.c
src/detection/camera/camera_android.c
src/util/platform/FFPlatform_unix.c
src/util/linux/elf.c
src/util/binary.c
)
elseif(FreeBSD)
list(APPEND LIBFASTFETCH_SRC
@@ -623,7 +623,7 @@ elseif(FreeBSD)
src/detection/wmtheme/wmtheme_linux.c
src/detection/camera/camera_linux.c
src/util/platform/FFPlatform_unix.c
src/util/linux/elf.c
src/util/binary.c
)
elseif(APPLE)
list(APPEND LIBFASTFETCH_SRC
@@ -689,6 +689,7 @@ elseif(APPLE)
src/util/apple/cf_helpers.c
src/util/apple/osascript.m
src/util/platform/FFPlatform_unix.c
src/util/binary.c
)
elseif(WIN32)
list(APPEND LIBFASTFETCH_SRC
@@ -755,6 +756,7 @@ elseif(WIN32)
src/util/windows/unicode.c
src/util/windows/wmi.cpp
src/util/platform/FFPlatform_windows.c
src/util/binary.c
)
elseif(SunOS)
list(APPEND LIBFASTFETCH_SRC
@@ -831,7 +833,7 @@ elseif(SunOS)
src/detection/wmtheme/wmtheme_linux.c
src/detection/camera/camera_nosupport.c
src/util/platform/FFPlatform_unix.c
src/util/linux/elf.c
src/util/binary.c
)
endif()
src/detection/editor/editor.c
+4 -4
View File
@@ -2,7 +2,7 @@
#include "common/processing.h"
#include "util/stringUtils.h"
#include "util/path.h"
#include "util/linux/elf.h"
#include "util/binary.h"
#include <stdlib.h>
@@ -92,11 +92,11 @@ const char* ffDetectEditor(FFEditorResult* result)
#if __linux__ || __FreeBSD__
if (ffStrbufEqualS(&result->exe, "nvim"))
ffElfExtractStrings(buf, extractNvimVersion, &result->version);
ffBinaryExtractStrings(buf, extractNvimVersion, &result->version);
else if (ffStrbufEqualS(&result->exe, "vim"))
ffElfExtractStrings(buf, extractVimVersion, &result->version);
ffBinaryExtractStrings(buf, extractVimVersion, &result->version);
else if (ffStrbufEqualS(&result->exe, "nano"))
ffElfExtractStrings(buf, extractNanoVersion, &result->version);
ffBinaryExtractStrings(buf, extractNanoVersion, &result->version);
if (result->version.length > 0) return NULL;
#endif
src/detection/initsystem/initsystem_linux.c
+2 -2
View File
@@ -1,6 +1,6 @@
#include "initsystem.h"
#include "common/processing.h"
#include "util/linux/elf.h"
#include "util/binary.h"
#include <unistd.h>
FF_MAYBE_UNUSED static bool elfExtractStringsCallBack(const char* str, uint32_t len, void* data)
@@ -49,7 +49,7 @@ const char* ffDetectInitSystem(FFInitSystemResult* result)
#if __linux__ && !__ANDROID__
if (ffStrbufEqualS(&result->name, "systemd"))
{
ffElfExtractStrings(result->exe.chars, elfExtractStringsCallBack, &result->version);
ffBinaryExtractStrings(result->exe.chars, elfExtractStringsCallBack, &result->version);
if (result->version.length == 0)
{
if (ffProcessAppendStdOut(&result->version, (char* const[]) {
src/detection/terminalfont/terminalfont_linux.c
+2 -2
View File
@@ -8,7 +8,7 @@
#include "detection/displayserver/displayserver.h"
#include "util/mallocHelper.h"
#include "util/stringUtils.h"
#include "util/linux/elf.h"
#include "util/binary.h"
static const char* getSystemMonospaceFont(void)
{
@@ -315,7 +315,7 @@ static void detectSt(FFTerminalFontResult* terminalFont, const FFTerminalResult*
{
ffStrbufClear(&font);
const char* error = ffElfExtractStrings(terminal->exePath.chars, elfExtractStringsCallBack, &font);
const char* error = ffBinaryExtractStrings(terminal->exePath.chars, elfExtractStringsCallBack, &font);
if (error)
{
ffStrbufAppendS(&terminalFont->error, error);
src/detection/terminalshell/terminalshell.c
+2 -2
View File
@@ -3,7 +3,7 @@
#include "common/processing.h"
#include "common/properties.h"
#include "util/stringUtils.h"
#include "util/linux/elf.h"
#include "util/binary.h"
#include <ctype.h>
#ifdef __FreeBSD__
@@ -265,7 +265,7 @@ FF_MAYBE_UNUSED static bool getTerminalVersionGnome(FFstrbuf* exe, FFstrbuf* ver
{
if (exe->chars[0] == '/')
{
ffElfExtractStrings(exe->chars, extractGnomeTerminalVersion, version);
ffBinaryExtractStrings(exe->chars, extractGnomeTerminalVersion, version);
if (version->length) return true;
}
src/util/linux/elf.c → src/util/binary.c
+4 -4
View File
@@ -1,4 +1,4 @@
#include "elf.h"
#include "binary.h"
#ifdef FF_HAVE_ELF
@@ -23,7 +23,7 @@ struct FFElfData {
bool inited;
} elfData;
const char* ffElfExtractStrings(const char* elfFile, bool (*cb)(const char* str, uint32_t len, void* userdata), void* userdata)
const char* ffBinaryExtractStrings(const char* elfFile, bool (*cb)(const char* str, uint32_t len, void* userdata), void* userdata)
{
if (!elfData.inited)
{
@@ -98,9 +98,9 @@ const char* ffElfExtractStrings(const char* elfFile, bool (*cb)(const char* str,
#else
const char* ffElfExtractStrings(const char* elfFile, bool (*cb)(const char* str, uint32_t len, void* userdata), void* userdata)
const char* ffBinaryExtractStrings(const char* file, bool (*cb)(const char* str, uint32_t len, void* userdata), void* userdata)
{
FF_UNUSED(elfFile, cb, userdata);
FF_UNUSED(file, cb, userdata);
return "Fastfetch was built without libelf support";
}
src/util/linux/elf.h → src/util/binary.h
+1 -1
View File
@@ -2,4 +2,4 @@
#include "fastfetch.h"
const char* ffElfExtractStrings(const char* elfFile, bool (*cb)(const char* str, uint32_t len, void* userdata), void* userdata);
const char* ffBinaryExtractStrings(const char* file, bool (*cb)(const char* str, uint32_t len, void* userdata), void* userdata);