Mercurial > dwindows
comparison makefile.vc @ 2169:a89841c500f8
Win: Clang/LLVM tools don't seem to accept / to specify options...
So switch everything to use - instead since it is valid for both toolchains.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Sun, 04 Oct 2020 21:55:29 +0000 |
parents | b08df531fd71 |
children | 6533fc42c951 |
comparison
equal
deleted
inserted
replaced
2168:b08df531fd71 | 2169:a89841c500f8 |
---|---|
150 -out:$(@) -def:$(DEFFILE) | 150 -out:$(@) -def:$(DEFFILE) |
151 $(LINKFLAGS) $(DLLLINKFLAGS) | 151 $(LINKFLAGS) $(DLLLINKFLAGS) |
152 $(OBJS) $(RES) | 152 $(OBJS) $(RES) |
153 $(LIBS) | 153 $(LIBS) |
154 << | 154 << |
155 $(WLIB) /def:$(DEFFILE) /machine:$(TARGET_CPU) /out:dw.lib | 155 $(WLIB) -def:$(DEFFILE) -machine:$(TARGET_CPU) -out:dw.lib |
156 mt.exe /manifest dw.dll.manifest $(SRCDIR)\win\dw.dll.$(TARGET_CPU).manifest /outputresource:dw.dll;2 | 156 mt.exe -manifest dw.dll.manifest $(SRCDIR)\win\dw.dll.$(TARGET_CPU).manifest -outputresource:dw.dll;2 |
157 -erase dw.dll.manifest | 157 -erase dw.dll.manifest |
158 copy dw.lib $(DWLIBDIR)\dw.lib | 158 copy dw.lib $(DWLIBDIR)\dw.lib |
159 copy dw.dll $(DWDLLDIR)\dw.dll | 159 copy dw.dll $(DWDLLDIR)\dw.dll |
160 | 160 |
161 dwcompat: dwcompat.dll | 161 dwcompat: dwcompat.dll |
165 -out:$(@) -def:$(DEFFILE2) | 165 -out:$(@) -def:$(DEFFILE2) |
166 $(LINKFLAGS) $(DLLLINKFLAGS) | 166 $(LINKFLAGS) $(DLLLINKFLAGS) |
167 $(OBJS2) $(RES) | 167 $(OBJS2) $(RES) |
168 $(LIBS) | 168 $(LIBS) |
169 << | 169 << |
170 $(WLIB) /def:$(DEFFILE2) /machine:$(TARGET_CPU) /out:dwcompat.lib | 170 $(WLIB) -def:$(DEFFILE2) -machine:$(TARGET_CPU) -out:dwcompat.lib |
171 mt.exe /manifest dwcompat.dll.manifest /outputresource:dwcompat.dll;2 | 171 mt.exe -manifest dwcompat.dll.manifest -outputresource:dwcompat.dll;2 |
172 -erase dwcompat.dll.manifest | 172 -erase dwcompat.dll.manifest |
173 copy dwcompat.lib $(DWLIBDIR)\dwcompat.lib | 173 copy dwcompat.lib $(DWLIBDIR)\dwcompat.lib |
174 copy dwcompat.dll $(DWDLLDIR)\dwcompat.dll | 174 copy dwcompat.dll $(DWDLLDIR)\dwcompat.dll |
175 !if exists($(WEBVIEW2DIR)\build\native\$(TARGET_CPU)\WebView2Loader.dll) | 175 !if exists($(WEBVIEW2DIR)\build\native\$(TARGET_CPU)\WebView2Loader.dll) |
176 copy $(WEBVIEW2DIR)\build\native\$(TARGET_CPU)\WebView2Loader.dll $(DWDLLDIR)\WebView2Loader.dll | 176 copy $(WEBVIEW2DIR)\build\native\$(TARGET_CPU)\WebView2Loader.dll $(DWDLLDIR)\WebView2Loader.dll |