diff options
| author | Neil <nyamatongwe@gmail.com> | 2018-06-07 14:40:20 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2018-06-07 14:40:20 +1000 |
| commit | db30b55467d5ea84e53454adf18a0859e67a17ac (patch) | |
| tree | 5362b341e8b2ad98442b1aeec71c109d3d2fa495 /win32 | |
| parent | 9002d79da5518e33227a1e91968d29a0ec3425fe (diff) | |
| download | scintilla-mirror-db30b55467d5ea84e53454adf18a0859e67a17ac.tar.gz | |
Remove compile-time ENABLE_BIDIRECTIONAL option as bidirectional feature is now
controlled completely at run-time.
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/makefile | 6 | ||||
| -rw-r--r-- | win32/scintilla.mak | 4 |
2 files changed, 1 insertions, 9 deletions
diff --git a/win32/makefile b/win32/makefile index e9f6d2bc7..a840cd1a9 100644 --- a/win32/makefile +++ b/win32/makefile @@ -43,11 +43,7 @@ LIBS=-lgdi32 -luser32 -limm32 -lole32 -luuid -loleaut32 -lmsimg32 $(LIBSMINGW) # Add -MMD to get dependencies INCLUDEDIRS=-I ../include -I ../src -I../lexlib -ifdef ENABLE_BIDIRECTIONAL -BIDIFLAGS=-DENABLE_BIDIRECTIONAL -endif - -CXXBASEFLAGS=--std=$(CXXSTD) -Wall -pedantic $(INCLUDEDIRS) $(BIDIFLAGS) -D_CRT_SECURE_NO_DEPRECATE=1 $(CLANG_OPTS) +CXXBASEFLAGS=--std=$(CXXSTD) -Wall -pedantic $(INCLUDEDIRS) -D_CRT_SECURE_NO_DEPRECATE=1 $(CLANG_OPTS) ifdef NO_CXX11_REGEX REFLAGS=-DNO_CXX11_REGEX diff --git a/win32/scintilla.mak b/win32/scintilla.mak index c64d48d3d..8a760fa39 100644 --- a/win32/scintilla.mak +++ b/win32/scintilla.mak @@ -40,10 +40,6 @@ CXXFLAGS=$(CXXFLAGS) $(NOLOGO) LDFLAGS=$(LDFLAGS) $(NOLOGO) !ENDIF -!IFDEF ENABLE_BIDIRECTIONAL -CXXFLAGS=$(CXXFLAGS) -DENABLE_BIDIRECTIONAL -!ENDIF - !IFDEF NO_CXX11_REGEX CXXFLAGS=$(CXXFLAGS) -DNO_CXX11_REGEX !ENDIF |