diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2023-04-26 15:51:06 +0800 |
|---|---|---|
| committer | Federico Mena Quintero <federico@gnome.org> | 2023-05-03 17:13:16 -0600 |
| commit | a697763b5a4e894398e216b901b1eb94e9078a72 (patch) | |
| tree | 1e98250d4d2fe75a2caab02bc7aee856e5c4facf | |
| parent | 93cbfe3db84c636146091fb109f4ff45a47d1100 (diff) | |
| download | librsvg-a697763b5a4e894398e216b901b1eb94e9078a72.tar.gz | |
Visual Studio: Further updates after separating crates
Make sure that we are building the correct target with Cargo when building the
internal Rust library for librsvg-c and update the intermediate target as
appropriate, so that we can properly link to it when building the final librsvg
DLL.
Also, reduce repetition in the NMake Makefiles by using Makefile variables
more.
Follow-up commit after changes in MR !822.
Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/824>
| -rw-r--r-- | win32/build-rules-msvc.mak | 2 | ||||
| -rw-r--r-- | win32/config-msvc.mak.in | 2 | ||||
| -rw-r--r-- | win32/rsvg-rust.mak | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/win32/build-rules-msvc.mak b/win32/build-rules-msvc.mak index cbc33507..2a66774a 100644 --- a/win32/build-rules-msvc.mak +++ b/win32/build-rules-msvc.mak @@ -134,6 +134,6 @@ clean: @-rmdir /s /q $(OUTDIR)\rsvg-tests @-rmdir /s /q $(OUTDIR)\rsvg-gdk-pixbuf-loader @-rmdir /s /q $(OUTDIR)\librsvg - $(MAKE) /f rsvg-rust.mak CFG=$(CFG) cargo-clean + $(MAKE) /f rsvg-rust.mak CFG=$(CFG) RSVG_INTERNAL_LIB=$(RSVG_INTERNAL_LIB) cargo-clean @-rmdir /s /q $(OUTDIR)\obj @-del build-$(PLAT)-$(CFG)*.bat diff --git a/win32/config-msvc.mak.in b/win32/config-msvc.mak.in index ce6cebd0..0d8b0c8b 100644 --- a/win32/config-msvc.mak.in +++ b/win32/config-msvc.mak.in @@ -106,7 +106,7 @@ TEST_DEP_LIBS = \ fontconfig.lib !endif -RSVG_INTERNAL_LIB = $(CARGO_TARGET_OUTPUT_DIR)\rsvg.lib +RSVG_INTERNAL_LIB = $(CARGO_TARGET_OUTPUT_DIR)\librsvg_c.lib LIBRSVG_DEP_LIBS = \ $(RSVG_INTERNAL_LIB) \ diff --git a/win32/rsvg-rust.mak b/win32/rsvg-rust.mak index 01e8e31b..ff8ef255 100644 --- a/win32/rsvg-rust.mak +++ b/win32/rsvg-rust.mak @@ -120,16 +120,16 @@ build-$(PLAT)-$(CFG).pre.bat: build-$(PLAT)-$(CFG)-lib.bat: build-$(PLAT)-$(CFG).pre.bat @type $**>$@ - @echo $(CARGO_CMD) $(RUST_VERBOSE_FLAG) --lib>>$@ + @echo $(CARGO_CMD) $(RUST_VERBOSE_FLAG) --package librsvg-c>>$@ build-$(PLAT)-$(CFG)-bin.bat: build-$(PLAT)-$(CFG).pre.bat @type $**>$@ @echo $(CARGO_CMD) $(RUST_VERBOSE_FLAG) --bin rsvg-convert>>$@ -$(CARGO_TARGET_OUTPUT_DIR)\rsvg.lib: build-$(PLAT)-$(CFG)-lib.bat +$(RSVG_INTERNAL_LIB): build-$(PLAT)-$(CFG)-lib.bat $(CARGO_TARGET_OUTPUT_DIR)\rsvg-convert.exe: build-$(PLAT)-$(CFG)-bin.bat -$(CARGO_TARGET_OUTPUT_DIR)\rsvg.lib \ +$(RSVG_INTERNAL_LIB) \ $(CARGO_TARGET_OUTPUT_DIR)\rsvg-convert.exe: @echo Please do not manually close the command window that pops up... @echo. @@ -140,13 +140,13 @@ $(CARGO_TARGET_OUTPUT_DIR)\rsvg-convert.exe: @start "Building the Rust bits for $(PLAT) Windows MSVC Build, please do not close this console window..." /wait /i cmd /c $** !else -$(CARGO_TARGET_OUTPUT_DIR)\rsvg.lib: +$(RSVG_INTERNAL_LIB): @set PATH=%PATH%;%HOMEPATH%\.cargo\bin @set GTK_LIB_DIR=$(LIBDIR);$(LIB) @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) $(RUST_VERBOSE_FLAG) --lib + $(CARGO_CMD) $(RUST_VERBOSE_FLAG) --package librsvg-c @set GTK_LIB_DIR= $(CARGO_TARGET_OUTPUT_DIR)\rsvg-convert.exe: |