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 | b8caeebffe178f292d636e3075de6c4a24c7a56a (patch) | |
| tree | 9f70d93731e6cf12a9f09637216fbab35ac506c7 /win32/scintilla.mak | |
| parent | dfedaa13977bcd49c14ac6c45aa86047f88aa6fe (diff) | |
| download | scintilla-mirror-b8caeebffe178f292d636e3075de6c4a24c7a56a.tar.gz | |
Backport: Remove automatic detection of Direct2D support during build.
DISABLE_D2D may still be defined to remove Direct2D features.
Backport of changeset 6672:9c1997a14d89.
Diffstat (limited to 'win32/scintilla.mak')
| -rw-r--r-- | win32/scintilla.mak | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/win32/scintilla.mak b/win32/scintilla.mak index b61099bdf..a48345745 100644 --- a/win32/scintilla.mak +++ b/win32/scintilla.mak @@ -40,11 +40,6 @@ CXXFLAGS=$(CXXFLAGS) $(NOLOGO) LDFLAGS=$(LDFLAGS) $(NOLOGO) !ENDIF -!IF [cl -c -nologo CheckD2D.cxx >NUL:] -CXXFLAGS=$(CXXFLAGS) -DDISABLE_D2D -!MESSAGE Direct2D is not available -!ENDIF - !IFDEF NO_CXX11_REGEX CXXFLAGS=$(CXXFLAGS) -DNO_CXX11_REGEX !ENDIF @@ -348,8 +343,6 @@ $(DIR_O)\CharacterSet.obj: \ $(DIR_O)\CharClassify.obj: \ ../src/CharClassify.cxx \ ../src/CharClassify.h -$(DIR_O)\CheckD2D.obj: \ - CheckD2D.cxx $(DIR_O)\ContractionState.obj: \ ../src/ContractionState.cxx \ ../include/Platform.h \ |