diff options
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 1d5d4d6c2..b190cc4d5 100644 --- a/win32/makefile +++ b/win32/makefile @@ -43,13 +43,7 @@ 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 - -CXXBASEFLAGS=--std=$(CXXSTD) -Wall -pedantic $(INCLUDEDIRS) $(D2DFLAGS) -D_CRT_SECURE_NO_DEPRECATE=1 $(CLANG_OPTS) +CXXBASEFLAGS=--std=$(CXXSTD) -Wall -pedantic $(INCLUDEDIRS) -D_CRT_SECURE_NO_DEPRECATE=1 $(CLANG_OPTS) ifdef NO_CXX11_REGEX REFLAGS=-DNO_CXX11_REGEX @@ -84,7 +78,7 @@ endif $(CC) $(CFLAGS) -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 |