diff options
Diffstat (limited to 'win32/Makefile.vc')
| -rw-r--r-- | win32/Makefile.vc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/win32/Makefile.vc b/win32/Makefile.vc index 18cac2b7..4c47f2a9 100644 --- a/win32/Makefile.vc +++ b/win32/Makefile.vc @@ -41,19 +41,17 @@ all: $(RSVG_TOOLS) $(EXTRA_TARGETS) build-info-librsvg tests: all $(rsvg_tests) @set PATH=$(BINDIR);$(PATH) - set G_TEST_SRCDIR=$(MAKEDIR)\..\tests + set G_TEST_SRCDIR=$(MAKEDIR)\..\librsvg-c\tests-c @for %%x in ($(rsvg_tests)) do %%x rsvg_rust_tests: - @set PATH=%PATH%;%HOMEPATH%\.cargo\bin - @set CARGO_TARGET_DIR=..\win32\vs$(VSVER)\$(CFG)\$(PLAT)\obj\rsvg_c_api + @set PATH=$(BINDIR);%PATH%;%HOMEPATH%\.cargo\bin @set GTK_LIB_DIR=$(LIBDIR);$(LIB) - $(RUSTUP_CMD) - @cd .. - $(CARGO_CMD:build=test) --verbose - @cd win32 + @set SYSTEM_DEPS_LIBXML2_LIB=$(LIBXML2_LIB:.lib=) + @if not "$(PKG_CONFIG_PATH)" == "" set PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) + @if not "$(PKG_CONFIG)" == "" set PKG_CONFIG=$(PKG_CONFIG) + $(CARGO_CMD:build=test) $(RUST_VERBOSE_FLAG) @set GTK_LIB_DIR= - @set CARGO_TARGET_DIR= # Include the rules for build directory creation and code generation !include generate-msvc.mak |