diff --git a/CMakeLists.txt b/CMakeLists.txt index 9906c36b0..1d99967f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -253,14 +253,15 @@ function(fastfetch_load_raw_text FILENAME OUTVAR) endfunction(fastfetch_load_raw_text) file(GLOB LOGO_FILES "src/logo/ascii/*.txt") +set(LOGO_BUILTIN_H "#pragma once\n\n") foreach(file ${LOGO_FILES}) fastfetch_load_raw_text("${file}" content) get_filename_component(file "${file}" NAME_WLE) string(TOUPPER "${file}" file) - string(REGEX REPLACE "\\$\\{c([0-9]+)\\}" "$\\1" DATATEXT_LOGO_${file} "${content}") + string(REGEX REPLACE "\\$\\{c([0-9]+)\\}" "$\\1" content "${content}") + set(LOGO_BUILTIN_H "${LOGO_BUILTIN_H}#define FASTFETCH_DATATEXT_LOGO_${file} ${content}\n") endforeach() - -configure_file(src/logo/builtin.h.in src_logo_builtin.h @ONLY) +file(GENERATE OUTPUT logo_builtin.h CONTENT "${LOGO_BUILTIN_H}") ####################### # libfastfetch target # diff --git a/src/logo/builtin.c b/src/logo/builtin.c index 237ee3e17..4dafa87ed 100644 --- a/src/logo/builtin.c +++ b/src/logo/builtin.c @@ -1,5 +1,5 @@ #include "logo.h" -#include "src_logo_builtin.h" // Generated with `src/logo/builtin.h` +#include "logo_builtin.h" #define FF_LOGO_INIT static FFlogo logo; static bool init = false; if(init) return &logo; init = true; // The names of small logo must end with `_small` or `-small` diff --git a/src/logo/builtin.h.in b/src/logo/builtin.h.in deleted file mode 100644 index 1e9c115d0..000000000 --- a/src/logo/builtin.h.in +++ /dev/null @@ -1,31 +0,0 @@ -#pragma once - -#ifndef FASTFETCH_INDLUDED_logo_builtin_h_in -#define FASTFETCH_INDLUDED_logo_builtin_h_in - -#define FASTFETCH_DATATEXT_LOGO_AIX @DATATEXT_LOGO_AIX@ -#define FASTFETCH_DATATEXT_LOGO_ASAHI @DATATEXT_LOGO_ASAHI@ -#define FASTFETCH_DATATEXT_LOGO_GNOME @DATATEXT_LOGO_GNOME@ -#define FASTFETCH_DATATEXT_LOGO_GNU @DATATEXT_LOGO_GNU@ -#define FASTFETCH_DATATEXT_LOGO_HAIKU @DATATEXT_LOGO_HAIKU@ -#define FASTFETCH_DATATEXT_LOGO_HAIKU_SMALL @DATATEXT_LOGO_HAIKU_SMALL@ -#define FASTFETCH_DATATEXT_LOGO_LMDE @DATATEXT_LOGO_LMDE@ -#define FASTFETCH_DATATEXT_LOGO_MANDRIVA @DATATEXT_LOGO_MANDRIVA@ -#define FASTFETCH_DATATEXT_LOGO_MINIX @DATATEXT_LOGO_MINIX@ -#define FASTFETCH_DATATEXT_LOGO_NETBSD @DATATEXT_LOGO_NETBSD@ -#define FASTFETCH_DATATEXT_LOGO_NOMADBSD @DATATEXT_LOGO_NOMADBSD@ -#define FASTFETCH_DATATEXT_LOGO_OPENBSD @DATATEXT_LOGO_OPENBSD@ -#define FASTFETCH_DATATEXT_LOGO_OPENBSD_SMALL @DATATEXT_LOGO_OPENBSD_SMALL@ -#define FASTFETCH_DATATEXT_LOGO_OPENSUSETUMBLEWEED2 @DATATEXT_LOGO_OPENSUSETUMBLEWEED2@ -#define FASTFETCH_DATATEXT_LOGO_OPENWRT @DATATEXT_LOGO_OPENWRT@ -#define FASTFETCH_DATATEXT_LOGO_ORACLE @DATATEXT_LOGO_ORACLE@ -#define FASTFETCH_DATATEXT_LOGO_SOLARIS @DATATEXT_LOGO_SOLARIS@ -#define FASTFETCH_DATATEXT_LOGO_SOLARIS_SMALL @DATATEXT_LOGO_SOLARIS_SMALL@ -#define FASTFETCH_DATATEXT_LOGO_UBUNTUKYLIN @DATATEXT_LOGO_UBUNTUKYLIN@ -#define FASTFETCH_DATATEXT_LOGO_UBUNTUMATE @DATATEXT_LOGO_UBUNTUMATE@ -#define FASTFETCH_DATATEXT_LOGO_UBUNTU2_SMALL @DATATEXT_LOGO_UBUNTU2_SMALL@ -#define FASTFETCH_DATATEXT_LOGO_UOS @DATATEXT_LOGO_UOS@ -#define FASTFETCH_DATATEXT_LOGO_WINDOWS95 @DATATEXT_LOGO_WINDOWS95@ -#define FASTFETCH_DATATEXT_LOGO_OPENKYLIN @DATATEXT_LOGO_OPENKYLIN@ - -#endif diff --git a/src/logo/logo.c b/src/logo/logo.c index 449901856..fece34793 100644 --- a/src/logo/logo.c +++ b/src/logo/logo.c @@ -540,6 +540,8 @@ void ffLogoBuiltinList(void) ++names; } + putchar('\n'); + puts(logo->data); putchar('\n'); ++methods; }