diff options
| -rw-r--r-- | doc/ScintillaHistory.html | 4 | ||||
| -rw-r--r-- | win32/CheckD2D.cxx | 3 | ||||
| -rw-r--r-- | win32/PlatWin.cxx | 2 | ||||
| -rw-r--r-- | win32/ScintillaWin.cxx | 2 | ||||
| -rw-r--r-- | win32/deps.mak | 1 | ||||
| -rw-r--r-- | win32/makefile | 10 | ||||
| -rw-r--r-- | win32/scintilla.mak | 7 |
7 files changed, 8 insertions, 21 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 5e89dd1cb..42e2ae462 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -549,6 +549,10 @@ The STATIC_BUILD preprocessor symbol is no longer used. </li> <li> + On Win32, Direct2D support is no longer automatically detected during build. + DISABLE_D2D may still be defined to remove Direct2D features. + </li> + <li> In some cases, invalid UTF-8 is handled in a way that is a little friendlier. For example, when copying to the clipboard on Windows, an invalid lead byte will be copied as the equivalent ISO 8859-1 character and will not hide the following byte. diff --git a/win32/CheckD2D.cxx b/win32/CheckD2D.cxx deleted file mode 100644 index 80f5d46d2..000000000 --- a/win32/CheckD2D.cxx +++ /dev/null @@ -1,3 +0,0 @@ -// This file is compiled to check whether Direct2D and DirectWrite headers are available. -#include <d2d1.h> -#include <dwrite.h> diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx index 2eab32b60..00b118c82 100644 --- a/win32/PlatWin.cxx +++ b/win32/PlatWin.cxx @@ -33,7 +33,7 @@ #include <richedit.h> #include <windowsx.h> -#if defined(NTDDI_WIN7) && !defined(DISABLE_D2D) +#if !defined(DISABLE_D2D) #define USE_D2D 1 #endif diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index 81ebdfaa8..71c1867d7 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -33,7 +33,7 @@ #include <zmouse.h> #include <ole2.h> -#if defined(NTDDI_WIN7) && !defined(DISABLE_D2D) +#if !defined(DISABLE_D2D) #define USE_D2D 1 #endif diff --git a/win32/deps.mak b/win32/deps.mak index f4db4cd0f..d504484c2 100644 --- a/win32/deps.mak +++ b/win32/deps.mak @@ -1,4 +1,3 @@ -CheckD2D.o: CheckD2D.cxx HanjaDic.o: HanjaDic.cxx ../src/UniConversion.h HanjaDic.h PlatWin.o: PlatWin.cxx ../include/Platform.h ../lexlib/StringCopy.h \ ../src/XPM.h ../src/UniConversion.h ../src/DBCS.h ../src/FontQuality.h 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 diff --git a/win32/scintilla.mak b/win32/scintilla.mak index 15de55698..abc00b1e6 100644 --- a/win32/scintilla.mak +++ b/win32/scintilla.mak @@ -44,11 +44,6 @@ LDFLAGS=$(LDFLAGS) $(NOLOGO) CXXFLAGS=$(CXXFLAGS) -DENABLE_BIDIRECTIONAL !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 @@ -351,8 +346,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 \ |