Mercurial > dwindows
comparison makefile.vc @ 2168:b08df531fd71
Win: Rename LIB to WLIB to prevent clobbering the library path.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Sun, 04 Oct 2020 21:24:22 +0000 |
parents | da33732f182d |
children | a89841c500f8 |
comparison
equal
deleted
inserted
replaced
2167:da33732f182d | 2168:b08df531fd71 |
---|---|
23 DWDLLDIR=.\dll | 23 DWDLLDIR=.\dll |
24 !endif | 24 !endif |
25 | 25 |
26 # Configure alternate compiler based on Clang/LLVM | 26 # Configure alternate compiler based on Clang/LLVM |
27 !if "$(CLANG)" == "Y" | 27 !if "$(CLANG)" == "Y" |
28 LIB=llvm-lib.exe | 28 WLIB=llvm-lib.exe |
29 CC=clang-cl.exe | 29 CC=clang-cl.exe |
30 LINK=lld-link.exe | 30 LINK=lld-link.exe |
31 !else | 31 !else |
32 LIB=lib.exe | 32 WLIB=lib.exe |
33 CC=cl.exe | 33 CC=cl.exe |
34 LINK=link.exe | 34 LINK=link.exe |
35 !endif | 35 !endif |
36 | 36 |
37 # | 37 # |
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 $(LIB) /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 |
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 $(LIB) /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) |