# HG changeset patch # User bsmith@81767d24-ef19-dc11-ae90-00e081727c95 # Date 1601846662 0 # Node ID b08df531fd71c76267bb865b5f2f64cd38404bde # Parent da33732f182d02866e350a78506e4505980ec955 Win: Rename LIB to WLIB to prevent clobbering the library path. diff -r da33732f182d -r b08df531fd71 makefile.vc --- a/makefile.vc Sun Oct 04 21:09:02 2020 +0000 +++ b/makefile.vc Sun Oct 04 21:24:22 2020 +0000 @@ -25,11 +25,11 @@ # Configure alternate compiler based on Clang/LLVM !if "$(CLANG)" == "Y" -LIB=llvm-lib.exe +WLIB=llvm-lib.exe CC=clang-cl.exe LINK=lld-link.exe !else -LIB=lib.exe +WLIB=lib.exe CC=cl.exe LINK=link.exe !endif @@ -152,7 +152,7 @@ $(OBJS) $(RES) $(LIBS) << - $(LIB) /def:$(DEFFILE) /machine:$(TARGET_CPU) /out:dw.lib + $(WLIB) /def:$(DEFFILE) /machine:$(TARGET_CPU) /out:dw.lib mt.exe /manifest dw.dll.manifest $(SRCDIR)\win\dw.dll.$(TARGET_CPU).manifest /outputresource:dw.dll;2 -erase dw.dll.manifest copy dw.lib $(DWLIBDIR)\dw.lib @@ -167,7 +167,7 @@ $(OBJS2) $(RES) $(LIBS) << - $(LIB) /def:$(DEFFILE2) /machine:$(TARGET_CPU) /out:dwcompat.lib + $(WLIB) /def:$(DEFFILE2) /machine:$(TARGET_CPU) /out:dwcompat.lib mt.exe /manifest dwcompat.dll.manifest /outputresource:dwcompat.dll;2 -erase dwcompat.dll.manifest copy dwcompat.lib $(DWLIBDIR)\dwcompat.lib