Mercurial > dwindows
comparison makefile.vc @ 2872:e62fc9b3b09c
C++: Add DW_NULL which is nullptr on C++11 and NULL on older versions.
This allows compilation on Visual C 2005 and hopefully ancient versions of GCC.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Mon, 19 Dec 2022 00:07:06 +0000 |
parents | 939fbceec13f |
children | ac404083dc6b |
comparison
equal
deleted
inserted
replaced
2871:4b7c4cd7a11d | 2872:e62fc9b3b09c |
---|---|
111 | 111 |
112 # The Visual C CRT and other Windows components have deprecated lots of common functions | 112 # The Visual C CRT and other Windows components have deprecated lots of common functions |
113 # These options will hide the deprecation warnings; Comment the next line to see them | 113 # These options will hide the deprecation warnings; Comment the next line to see them |
114 CRT_FLAGS = -D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNING -D_WINSOCK_DEPRECATED_NO_WARNINGS | 114 CRT_FLAGS = -D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNING -D_WINSOCK_DEPRECATED_NO_WARNINGS |
115 | 115 |
116 CFLAGS = -c $(PLATFORM_DEF) -D__WIN32__ -DMSVC -DRICHEDIT -DTOOLBAR -DGDIPLUS -DAEROGLASS -D_UNICODE -DUNICODE -DBUILD_DLL -DISOLATION_AWARE_ENABLED=1 -I$(SRCDIR)\platform -I$(SRCDIR) $(WEBVIEW2INC) $(WINTOASTINC) $(SVNVERSION) $(CRT_FLAGS) | 116 CFLAGS = -c $(PLATFORM_DEF) -D__WIN32__ -DMSVC -DRICHEDIT -DTOOLBAR -DGDIPLUS -D_UNICODE -DUNICODE -DBUILD_DLL -DISOLATION_AWARE_ENABLED=1 -I$(SRCDIR)\platform -I$(SRCDIR) $(WEBVIEW2INC) $(WINTOASTINC) $(SVNVERSION) $(CRT_FLAGS) |
117 LIBS = wsock32.lib kernel32.lib user32.lib comctl32.lib gdi32.lib advapi32.lib shell32.lib comdlg32.lib ole32.lib oleaut32.lib userenv.lib msimg32.lib gdiplus.lib $(WEBVIEW2LIB) | 117 LIBS = wsock32.lib kernel32.lib user32.lib comctl32.lib gdi32.lib advapi32.lib shell32.lib comdlg32.lib ole32.lib oleaut32.lib userenv.lib msimg32.lib gdiplus.lib $(WEBVIEW2LIB) |
118 RES = | 118 RES = |
119 LINKFLAGS = -machine:$(TARGET_CPU) -manifest $(LINK_DEBUG) | 119 LINKFLAGS = -machine:$(TARGET_CPU) -manifest $(LINK_DEBUG) |
120 DLLLINKFLAGS = -dll | 120 DLLLINKFLAGS = -dll |
121 DEFFILE = $(SRCDIR)\win\dw.def | 121 DEFFILE = $(SRCDIR)\win\dw.def |