nnn

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs | README | LICENSE

commit 22aa1455a6081ace0e1b1c09435a447296f914bf
parent 5456ba458292e4a8ab3c822e116bcbee77dbf103
Author: Arun <engineerarun@gmail.com>
Date:   Sat, 30 Mar 2024 01:33:20 +0530

Merge pull request #1861 from KlzXS/makefile_icons

Prevent multiple icons options being selected at the same time
Diffstat:
MMakefile | 14++++++++++++++
1 file changed, 14 insertions(+), 0 deletions(-)

diff --git a/Makefile b/Makefile @@ -36,6 +36,8 @@ O_GITSTATUS := 0 # add git status to detail view O_NAMEFIRST := 0 # print file name first, add uid and guid to detail view O_RESTOREPREVIEW := 0 # add preview pipe to close and restore preview pane +T_ICONS := 0 # test if multiple icons options are set and fail + # convert targets to flags for backwards compatibility ifneq ($(filter debug,$(MAKECMDGOALS)),) O_DEBUG := 1 @@ -97,16 +99,28 @@ endif ifeq ($(strip $(O_ICONS)),1) ICONS_INCLUDE = icons-generated-icons-in-term.h CPPFLAGS += -DICONS_IN_TERM -DICONS_INCLUDE=\"$(ICONS_INCLUDE)\" +ifeq ($(strip $(T_ICONS)),1) +$(error Choose only one system for icons (O_ICONS, O_NERD or O_EMOJI)) +endif + T_ICONS := 1 endif ifeq ($(strip $(O_NERD)),1) ICONS_INCLUDE = icons-generated-nerd.h CPPFLAGS += -DNERD -DICONS_INCLUDE=\"$(ICONS_INCLUDE)\" +ifeq ($(strip $(T_ICONS)),1) +$(error Choose only one system for icons (O_ICONS, O_NERD or O_EMOJI)) +endif + T_ICONS := 1 endif ifeq ($(strip $(O_EMOJI)),1) ICONS_INCLUDE = icons-generated-emoji.h CPPFLAGS += -DEMOJI -DICONS_INCLUDE=\"$(ICONS_INCLUDE)\" +ifeq ($(strip $(T_ICONS)),1) +$(error Choose only one system for icons (O_ICONS, O_NERD or O_EMOJI)) +endif + T_ICONS := 1 endif ifeq ($(strip $(O_QSORT)),1)