Mercurial > dwindows

comparison makefile.vc @ 2082:3144912829e2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Minor build issues
author mhessling@81767d24-ef19-dc11-ae90-00e081727c95
date Sun, 31 May 2020 05:26:02 +0000
parents 8f08d4c9d3fc
children 94ea915bd917
comparison
equal deleted inserted replaced
2081:24875681eec5 2082:3144912829e2
81 # 81 #
82 !if "$(WEBVIEW2DIR)" == "" 82 !if "$(WEBVIEW2DIR)" == ""
83 WEBVIEW2DIR=$(SRCDIR)\packages\Microsoft.Web.WebView2 83 WEBVIEW2DIR=$(SRCDIR)\packages\Microsoft.Web.WebView2
84 !endif 84 !endif
85 85
86 !if exists($(WEBVIEW2DIR)\build\native\include\WebView2.h) 86 !if exists($(WEBVIEW2DIR)\build\native\include\WebView2.h)
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
130 $(LINKFLAGS) $(DLLLINKFLAGS) 130 $(LINKFLAGS) $(DLLLINKFLAGS)
131 $(OBJS) $(RES) 131 $(OBJS) $(RES)
132 $(LIBS) 132 $(LIBS)
133 << 133 <<
134 lib /def:$(DEFFILE) /machine:$(TARGET_CPU) /out:dw.lib 134 lib /def:$(DEFFILE) /machine:$(TARGET_CPU) /out:dw.lib
135 mt.exe /manifest dw.dll.manifest win\dw.dll.$(TARGET_CPU).manifest /outputresource:dw.dll;2 135 mt.exe /manifest dw.dll.manifest $(SRCDIR)\win\dw.dll.$(TARGET_CPU).manifest /outputresource:dw.dll;2
136 -erase dw.dll.manifest 136 -erase dw.dll.manifest
137 copy dw.lib $(DWLIBDIR)\dw.lib 137 copy dw.lib $(DWLIBDIR)\dw.lib
138 copy dw.dll $(DWDLLDIR)\dw.dll 138 copy dw.dll $(DWDLLDIR)\dw.dll
139 139
140 dwcompat: dwcompat.dll 140 dwcompat: dwcompat.dll
149 lib /def:$(DEFFILE2) /machine:$(TARGET_CPU) /out:dwcompat.lib 149 lib /def:$(DEFFILE2) /machine:$(TARGET_CPU) /out:dwcompat.lib
150 mt.exe /manifest dwcompat.dll.manifest /outputresource:dwcompat.dll;2 150 mt.exe /manifest dwcompat.dll.manifest /outputresource:dwcompat.dll;2
151 -erase dwcompat.dll.manifest 151 -erase dwcompat.dll.manifest
152 copy dwcompat.lib $(DWLIBDIR)\dwcompat.lib 152 copy dwcompat.lib $(DWLIBDIR)\dwcompat.lib
153 copy dwcompat.dll $(DWDLLDIR)\dwcompat.dll 153 copy dwcompat.dll $(DWDLLDIR)\dwcompat.dll
154 !if exists($(WEBVIEW2DIR)\build\native\$(TARGET_CPU)\WebView2Loader.dll) 154 !if exists($(WEBVIEW2DIR)\build\native\$(TARGET_CPU)\WebView2Loader.dll)
155 copy $(WEBVIEW2DIR)\build\native\$(TARGET_CPU)\WebView2Loader.dll $(DWDLLDIR)\WebView2Loader.dll 155 copy $(WEBVIEW2DIR)\build\native\$(TARGET_CPU)\WebView2Loader.dll $(DWDLLDIR)\WebView2Loader.dll
156 !endif 156 !endif
157 157
158 dw.obj: $(SRCDIR)\win\dw.c 158 dw.obj: $(SRCDIR)\win\dw.c
159 $(CC) $(CFLAGS) $(CFLAGS_DEBUG) $(SRCDIR)\win\dw.c 159 $(CC) $(CFLAGS) $(CFLAGS_DEBUG) $(SRCDIR)\win\dw.c
174 $(CC) $(CFLAGS) $(CFLAGS_DEBUG) $(SRCDIR)\dwcompat.c 174 $(CC) $(CFLAGS) $(CFLAGS_DEBUG) $(SRCDIR)\dwcompat.c
175 175
176 dwtest.obj: $(SRCDIR)\dwtest.c 176 dwtest.obj: $(SRCDIR)\dwtest.c
177 $(CC) $(CFLAGS) $(CFLAGS_DEBUG) $(SRCDIR)\dwtest.c 177 $(CC) $(CFLAGS) $(CFLAGS_DEBUG) $(SRCDIR)\dwtest.c
178 178
179 winmain.obj: $(SRCDIR)\winmain.c
180 $(CC) $(CFLAGS) $(CFLAGS_DEBUG) $(SRCDIR)\winmain.c
181
179 dwtest: dwtest.exe 182 dwtest: dwtest.exe
180 183
181 dwtest.exe: dwtest.obj winmain.obj 184 dwtest.exe: dwtest.obj winmain.obj
182 $(LINK) $(LINKFLAGS) /out:dwtest.exe dwtest.obj winmain.obj /subsystem:windows $(DWLIBDIR)\dwcompat.lib $(DWLIBDIR)\dw.lib $(LIBS) 185 $(LINK) $(LINKFLAGS) /out:dwtest.exe dwtest.obj winmain.obj /subsystem:windows $(DWLIBDIR)\dwcompat.lib $(DWLIBDIR)\dw.lib $(LIBS)
183 mt.exe /manifest dwtest.exe.manifest win\dwtest.exe.$(TARGET_CPU).manifest /outputresource:dwtest.exe;1 186 mt.exe /manifest dwtest.exe.manifest $(SRCDIR)\win\dwtest.exe.$(TARGET_CPU).manifest /outputresource:dwtest.exe;1
184 -erase dwtest.exe.manifest 187 -erase dwtest.exe.manifest
185 188
186 zip: dw.dll 189 zip: dw.dll
187 copy win\readme-win.txt . 190 copy win\readme-win.txt .
188 zip dwindows-$(PLATFORM_NAME)-$(VERDOT).zip readme-win.txt readme.txt dw.dll dwcompat.dll dw.lib dwcompat.lib dw.h dwcompat.h 191 zip dwindows-$(PLATFORM_NAME)-$(VERDOT).zip readme-win.txt readme.txt dw.dll dwcompat.dll dw.lib dwcompat.lib dw.h dwcompat.h