amext-msvc: random cleanups

diff --git a/mk/amext-msvc.mk b/mk/amext-msvc.mk
index c36024ee4b2abedb9501cece5a752026b61dc1ca..f3fbae6bf23e5acb4bb4e33c85a1064c48978c5e 100644 (file)
--- a/mk/amext-msvc.mk
+++ b/mk/amext-msvc.mk
@@ -1,29 +1,29 @@
 
 
 SHELL = cmd.exe
-ShellQuote = "$(subst ",\",$(1))"
+ShellQuote = "$(subst $$, \$$, $(subst ",\",$(subst \,\\,$(1))))"
 
 EXEEXT = .exe
 LIBEXT = .lib
 OBJEXT = .obj
 
 CC = cl -nologo
-CFLAGS = -O2
-WFLAGS = -W2 -WX
+CFLAGS = -O2 $(WFLAGS)
+WFLAGS = -W2 -w24013
 CPP = $(CC) -E
 
 LDFLAGS =
 LIBS = -lws2_32 -ladvapi32
 
 AR = lib
-ARFLAGS = -nologo -out:$(call vcFixPath,$@)
+ARFLAGS = -nologo
 
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -Fe$(call vcFixPath,$@)
 
 Printf = printf $(subst %,%%,$(1)) $(2)
 MKDIR_P = md
 
-MkDir = if not exist $(1) $(MKDIR_P) $(call vcFixPath,$(1))
+MkDir = if not exist $(call vcFixPath,$(1)) $(MKDIR_P) $(call vcFixPath,$(1))
 
 vcFixPath = $(subst /,\,$(1))
 vcFixLibs = $(patsubst %.a,%.lib,$(patsubst -l%,%.lib,$(1)))
@@ -31,7 +31,7 @@ vcFixAll = $(call vcFixPath,$(call vcFixLibs,$(1)))
 
 define AM_LANG_C_COMPILE
        $(E) "CC" $<
-       $(Q) $(COMPILE) -c -Fo$(call vcFixPath,$@) $<
+       $(Q) $(COMPILE) -c -Fo$(call vcFixPath,$@) $< | tail -n+2
 endef
 
 define AM_LANG_C_LINK
@@ -40,8 +40,7 @@ define AM_LANG_C_LINK
 endef
 
 define ar_lib
-       $(Q) $(call MkDir,$(dir $@))
        $(E) "LIB" $@
-       $(Q) $(AM) $(ARFLAGS) $^
+       $(Q) $(AR) $(ARFLAGS) -out:$(call vcFixPath,$@) $^
 endef