diff options
| author | Neil <nyamatongwe@gmail.com> | 2018-04-04 16:41:24 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2018-04-04 16:41:24 +1000 |
| commit | 837ca0527d7fa9286cae4755038e458d4f0e2a02 (patch) | |
| tree | ca2661bffa19661a47eea76d630849f7c01efbe0 /win32/makefile | |
| parent | 580e8f6567bca0554e3844a16a5417459fac2851 (diff) | |
| download | scintilla-mirror-837ca0527d7fa9286cae4755038e458d4f0e2a02.tar.gz | |
Remove automatic detection of Direct2D support during build.
DISABLE_D2D may still be defined to remove Direct2D features.
Diffstat (limited to 'win32/makefile')
| -rw-r--r-- | win32/makefile | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/win32/makefile b/win32/makefile index 88014a093..e9f6d2bc7 100644 --- a/win32/makefile +++ b/win32/makefile @@ -43,17 +43,11 @@ LIBS=-lgdi32 -luser32 -limm32 -lole32 -luuid -loleaut32 -lmsimg32 $(LIBSMINGW) # Add -MMD to get dependencies INCLUDEDIRS=-I ../include -I ../src -I../lexlib -# Check if Direct2D headers are available by trying to compile a file that includes them. -# Most distributions of MinGW32 do not include Direct2D support but MinGW64 does. -ifneq "$(shell $(CXX) -c CheckD2D.cxx 2>&1)" "" -D2DFLAGS=-DDISABLE_D2D -endif - ifdef ENABLE_BIDIRECTIONAL BIDIFLAGS=-DENABLE_BIDIRECTIONAL endif -CXXBASEFLAGS=--std=$(CXXSTD) -Wall -pedantic $(INCLUDEDIRS) $(D2DFLAGS) $(BIDIFLAGS) -D_CRT_SECURE_NO_DEPRECATE=1 $(CLANG_OPTS) +CXXBASEFLAGS=--std=$(CXXSTD) -Wall -pedantic $(INCLUDEDIRS) $(BIDIFLAGS) -D_CRT_SECURE_NO_DEPRECATE=1 $(CLANG_OPTS) ifdef NO_CXX11_REGEX REFLAGS=-DNO_CXX11_REGEX @@ -75,7 +69,7 @@ clean: $(CXX) $(CXXFLAGS) $(REFLAGS) -c $< analyze: - $(CXX) --analyze $(D2DFLAGS) $(CXXFLAGS) *.cxx ../src/*.cxx ../lexlib/*.cxx ../lexers/*.cxx + $(CXX) --analyze $(CXXFLAGS) *.cxx ../src/*.cxx ../lexlib/*.cxx ../lexers/*.cxx deps: $(CXX) -MM $(CXXFLAGS) *.cxx ../src/*.cxx ../lexlib/*.cxx ../lexers/*.cxx >deps.mak |