diff options
| author | nyamatongwe <devnull@localhost> | 2012-07-17 19:38:23 +1000 |
|---|---|---|
| committer | nyamatongwe <devnull@localhost> | 2012-07-17 19:38:23 +1000 |
| commit | 6fb1f1659c965bf963637dc9e0de38ff2607734a (patch) | |
| tree | 64a2d12e2c1a623ed406a82463384b81aa7e331f /win32/scintilla.mak | |
| parent | 320387a42d5777d29c5f439841f00f84bd51be48 (diff) | |
| download | scintilla-mirror-6fb1f1659c965bf963637dc9e0de38ff2607734a.tar.gz | |
Refine checking for Direct2D and DirectWrite by using NTDDI_WIN7 to indicate
a recent SDK and allow disabling Direct2D by defining DISABLE_D2D.
Run a test compile of a file that includes these headers and use compilation
failure to disable Direct2D.
Diffstat (limited to 'win32/scintilla.mak')
| -rw-r--r-- | win32/scintilla.mak | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/win32/scintilla.mak b/win32/scintilla.mak index b4ca7204a..e57da3c71 100644 --- a/win32/scintilla.mak +++ b/win32/scintilla.mak @@ -36,6 +36,11 @@ 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 DEBUG CXXFLAGS=$(CXXFLAGS) $(CXXDEBUG) LDFLAGS=$(LDDEBUG) $(LDFLAGS) |