Mercurial > dwindows

changeset 2168:b08df531fd71

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
files makefile.vc
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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