msvc cleanup

diff --git a/build_msvc.mk b/build_msvc.mk
index f7f8581b54ee47aed806381152692a5f429afbc1..77f681994cee7e4ad71b6676e99d4fe0e8505e6b 100644 (file)
--- a/build_msvc.mk
+++ b/build_msvc.mk
@@ -1,7 +1,11 @@
 
 AM_FEATURES = msvc
 
-abs_top_srcdir = $(dir $(filter %build.mk, $(MAKEFILE_LIST)))
+# make it work also when included from test/Makefile
+top_srcdir = $(dir $(filter %build.mk, $(MAKEFILE_LIST)))
+top_builddir = $(top_srcdir)
+abs_top_srcdir := $(abspath $(top_srcdir))
+abs_top_builddir := $(abs_top_srcdir)
 
 include $(abs_top_srcdir)/mk/antimake.mk
 

diff --git a/mk/amext-msvc.mk b/mk/amext-msvc.mk
index 0e0a304693f2bcac372e57a2ef28689ae94c0128..c36024ee4b2abedb9501cece5a752026b61dc1ca 100644 (file)
--- a/mk/amext-msvc.mk
+++ b/mk/amext-msvc.mk
@@ -1,6 +1,7 @@
 
 
 SHELL = cmd.exe
+ShellQuote = "$(subst ",\",$(1))"
 
 EXEEXT = .exe
 LIBEXT = .lib