Mercurial > dwindows

comparison makefile.vc @ 2088:94ea915bd917

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Win: Initial implementation of notifications on Windows. Currently using WinToast. Update readme regarding WinToast support and in-source comments regarding the API. Fix missing "API" calling conventions on OS/2 and Windows.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Fri, 05 Jun 2020 16:27:00 +0000
parents 3144912829e2
children da33732f182d
comparison
equal deleted inserted replaced
2087:082d743f3214 2088:94ea915bd917
87 WEBVIEW2INC=-DBUILD_EDGE -I$(WEBVIEW2DIR)\build\native\include 87 WEBVIEW2INC=-DBUILD_EDGE -I$(WEBVIEW2DIR)\build\native\include
88 WEBVIEW2LIB=$(WEBVIEW2DIR)\build\native\$(TARGET_CPU)\WebView2Loader.dll.lib 88 WEBVIEW2LIB=$(WEBVIEW2DIR)\build\native\$(TARGET_CPU)\WebView2Loader.dll.lib
89 WEBVIEW2OBJ=edge.obj 89 WEBVIEW2OBJ=edge.obj
90 !endif 90 !endif
91 91
92 #
93 # Settings for supporting WinToast notifications
94 #
95 !if "$(WINTOASTDIR)" == ""
96 WINTOASTDIR=$(SRCDIR)\packages\WinToast
97 !endif
98
99 !if exists($(WINTOASTDIR)\src\wintoastlib.h)
100 WINTOASTINC=-DBUILD_TOAST -I$(WINTOASTDIR)\src
101 WINTOASTOBJ=wintoast.obj wintoastlib.obj
102 !endif
103
92 CC = cl 104 CC = cl
93 CFLAGS = -c $(PLATFORM_DEF) -D__WIN32__ -DMSVC -DTOOLBAR -DGDIPLUS -DAEROGLASS -D_UNICODE -DUNICODE -DBUILD_DLL -DISOLATION_AWARE_ENABLED=1 -I$(SRCDIR)\platform -I$(SRCDIR) $(WEBVIEW2INC) $(SVNVERSION) 105 CFLAGS = -c $(PLATFORM_DEF) -D__WIN32__ -DMSVC -DTOOLBAR -DGDIPLUS -DAEROGLASS -D_UNICODE -DUNICODE -DBUILD_DLL -DISOLATION_AWARE_ENABLED=1 -I$(SRCDIR)\platform -I$(SRCDIR) $(WEBVIEW2INC) $(WINTOASTINC) $(SVNVERSION)
94 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) 106 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)
95 RES = 107 RES =
96 LINKFLAGS = -machine:$(TARGET_CPU) -manifest $(LINK_DEBUG) 108 LINKFLAGS = -machine:$(TARGET_CPU) -manifest $(LINK_DEBUG)
97 DLLLINKFLAGS = -dll 109 DLLLINKFLAGS = -dll
98 LINK = link 110 LINK = link
99 DEFFILE = $(SRCDIR)\win\dw.def 111 DEFFILE = $(SRCDIR)\win\dw.def
100 DEFFILE2 = $(SRCDIR)\win\dwcompat.def 112 DEFFILE2 = $(SRCDIR)\win\dwcompat.def
101 113
102 OBJS = dw.obj browser.obj XBrowseForFolder.obj $(WEBVIEW2OBJ) 114 OBJS = dw.obj browser.obj XBrowseForFolder.obj $(WEBVIEW2OBJ) $(WINTOASTOBJ)
103 115
104 OBJS2 = dwcompat.obj dirent.obj 116 OBJS2 = dwcompat.obj dirent.obj
105 117
106 all: dw dwcompat dwtest 118 all: dw dwcompat dwtest
107 119
165 $(CC) $(CFLAGS) $(CFLAGS_DEBUG) $(SRCDIR)\win\XBrowseForFolder.cpp 177 $(CC) $(CFLAGS) $(CFLAGS_DEBUG) $(SRCDIR)\win\XBrowseForFolder.cpp
166 178
167 edge.obj: $(SRCDIR)\win\edge.cpp 179 edge.obj: $(SRCDIR)\win\edge.cpp
168 $(CC) $(CFLAGS) $(CFLAGS_DEBUG) $(SRCDIR)\win\edge.cpp 180 $(CC) $(CFLAGS) $(CFLAGS_DEBUG) $(SRCDIR)\win\edge.cpp
169 181
182 wintoast.obj: $(SRCDIR)\win\wintoast.cpp
183 $(CC) $(CFLAGS) /EHsc $(CFLAGS_DEBUG) $(SRCDIR)\win\wintoast.cpp
184
185 wintoastlib.obj: $(WINTOASTDIR)\src\wintoastlib.cpp
186 $(CC) $(CFLAGS) /EHsc $(CFLAGS_DEBUG) $(WINTOASTDIR)\src\wintoastlib.cpp
187
170 dirent.obj: $(SRCDIR)\win\dirent.c 188 dirent.obj: $(SRCDIR)\win\dirent.c
171 $(CC) $(CFLAGS) $(CFLAGS_DEBUG) $(SRCDIR)\win\dirent.c 189 $(CC) $(CFLAGS) $(CFLAGS_DEBUG) $(SRCDIR)\win\dirent.c
172 190
173 dwcompat.obj: $(SRCDIR)\dwcompat.c 191 dwcompat.obj: $(SRCDIR)\dwcompat.c
174 $(CC) $(CFLAGS) $(CFLAGS_DEBUG) $(SRCDIR)\dwcompat.c 192 $(CC) $(CFLAGS) $(CFLAGS_DEBUG) $(SRCDIR)\dwcompat.c