diff options
| author | Neil <nyamatongwe@gmail.com> | 2018-01-11 19:23:33 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2018-01-11 19:23:33 +1100 |
| commit | f0fe52e3df9ea9a5a760aca22844d626f4a2926c (patch) | |
| tree | fbe781f23fe77bf3b6fd190e81fde3224ff1f13b | |
| parent | 01c48f98e5557089fc7501394f905a5b15fde9c0 (diff) | |
| download | scintilla-mirror-f0fe52e3df9ea9a5a760aca22844d626f4a2926c.tar.gz | |
Add ENABLE_BIDIRECTIONAL option to make files.
| -rw-r--r-- | win32/makefile | 6 | ||||
| -rw-r--r-- | win32/scintilla.mak | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/win32/makefile b/win32/makefile index cfd5b27d9..894026e9a 100644 --- a/win32/makefile +++ b/win32/makefile @@ -43,7 +43,11 @@ ifneq "$(shell $(CXX) -c CheckD2D.cxx 2>&1)" "" D2DFLAGS=-DDISABLE_D2D endif -CXXBASEFLAGS=--std=$(CXXSTD) -Wall -pedantic $(INCLUDEDIRS) $(D2DFLAGS) -D_CRT_SECURE_NO_DEPRECATE=1 +ifdef ENABLE_BIDIRECTIONAL +BIDIFLAGS=-DENABLE_BIDIRECTIONAL +endif + +CXXBASEFLAGS=--std=$(CXXSTD) -Wall -pedantic $(INCLUDEDIRS) $(D2DFLAGS) $(BIDIFLAGS) -D_CRT_SECURE_NO_DEPRECATE=1 ifdef NO_CXX11_REGEX REFLAGS=-DNO_CXX11_REGEX diff --git a/win32/scintilla.mak b/win32/scintilla.mak index 75becbfd1..8cdb0f958 100644 --- a/win32/scintilla.mak +++ b/win32/scintilla.mak @@ -40,6 +40,10 @@ CXXFLAGS=$(CXXFLAGS) $(NOLOGO) LDFLAGS=$(LDFLAGS) $(NOLOGO) !ENDIF +!IFDEF ENABLE_BIDIRECTIONAL +CXXFLAGS=$(CXXFLAGS) -DENABLE_BIDIRECTIONAL +!ENDIF + !IF [cl -c -nologo CheckD2D.cxx >NUL:] CXXFLAGS=$(CXXFLAGS) -DDISABLE_D2D !MESSAGE Direct2D is not available |