aboutsummaryrefslogtreecommitdiffhomepage
path: root/win32/makefile
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2018-03-31 12:15:54 +1100
committerNeil <nyamatongwe@gmail.com>2018-03-31 12:15:54 +1100
commit9f2bbd79a254363a06aaf562dfdd135e1dccbd58 (patch)
treecafb4d1ce6e3b644898ec82d250237c02c294ad5 /win32/makefile
parentf1398be0f55048ed2ef0ec8b51e376df694d4a70 (diff)
downloadscintilla-mirror-9f2bbd79a254363a06aaf562dfdd135e1dccbd58.tar.gz
Standardize on --std=c++17, avoiding GNU extensions and enabling clang 6.0.
Diffstat (limited to 'win32/makefile')
-rw-r--r--win32/makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/win32/makefile b/win32/makefile
index 1550484dc..86c7e6792 100644
--- a/win32/makefile
+++ b/win32/makefile
@@ -15,15 +15,15 @@ LIBSCI = $(DIR_BIN)/libscintilla.a
ifdef CLANG
# Common location for 32-bit clang on Windows
CXX = "C:\Program Files (x86)\LLVM\bin\clang++"
-CXXSTD = c++14
else
# MinGW GCC
LDMINGW = -Wl,--enable-runtime-pseudo-reloc-v2 -Wl,--add-stdcall-alias
LIBSMINGW = -lstdc++
STRIPOPTION = -s
-CXXSTD = gnu++17
endif
+CXXSTD = c++17
+
ifeq ($(OS),Windows_NT)
DEL = $(if $(wildcard $(dir $(SHELL))rm.exe), $(dir $(SHELL))rm.exe -f, del /q)
else