From aa09b247fbe224f7c0f51c79f94a0d9a3bacfc0b Mon Sep 17 00:00:00 2001 From: Neil Date: Fri, 4 Apr 2025 10:25:36 +1100 Subject: Indent makefile more consistently to help clarify structure. --- win32/makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'win32/makefile') diff --git a/win32/makefile b/win32/makefile index 5db9e6625..6179aac5a 100644 --- a/win32/makefile +++ b/win32/makefile @@ -18,12 +18,12 @@ LIBSCI = $(DIR_BIN)/libscintilla.a WARNINGS = -Wpedantic -Wall -Wextra ifdef CLANG -CXX = clang++ + CXX = clang++ else -# MinGW GCC -LIBSMINGW = -lstdc++ -STRIPOPTION = -s -WARNINGS += -Wconversion + # MinGW GCC + LIBSMINGW = -lstdc++ + STRIPOPTION = -s + WARNINGS += -Wconversion endif ARFLAGS = rc RANLIB ?= ranlib @@ -37,9 +37,9 @@ normalize = $(if $(windir),$(subst /,\,$1),$1) PYTHON = $(if $(windir),pyw,python3) ifdef windir -DEL = $(if $(wildcard $(dir $(SHELL))rm.exe), $(dir $(SHELL))rm.exe -f, del /q) + DEL = $(if $(wildcard $(dir $(SHELL))rm.exe), $(dir $(SHELL))rm.exe -f, del /q) else -DEL = rm -f + DEL = rm -f endif vpath %.h ../src ../include @@ -53,14 +53,14 @@ INCLUDES=-I ../include -I ../src BASE_FLAGS += $(WARNINGS) ifdef NO_CXX11_REGEX -DEFINES += -DNO_CXX11_REGEX + DEFINES += -DNO_CXX11_REGEX endif DEFINES += -D$(if $(DEBUG),DEBUG,NDEBUG) BASE_FLAGS += $(if $(DEBUG),-g,-O3) ifndef DEBUG -STRIPFLAG=$(STRIPOPTION) + STRIPFLAG=$(STRIPOPTION) endif CXX_BASE_FLAGS =--std=c++17 $(BASE_FLAGS) -- cgit v1.2.3