[librsvg/rustification] Visual Studio builds: Fix librsvg DLL linking
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg/rustification] Visual Studio builds: Fix librsvg DLL linking
- Date: Fri, 16 Dec 2016 07:51:18 +0000 (UTC)
commit 7ee84512eb9b803ea73e62d75d30c3634281e1ad
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Fri Dec 16 15:00:33 2016 +0800
Visual Studio builds: Fix librsvg DLL linking
Due to the rustification, we need to link to:
-The static .lib that comes from building the rustified parts of librsvg
-Additional system libraries that become dependent due to the rustification
parts.
Also, we no longer need to include math.h from the $(SolutionDir) since the
stock math.h shipped with Visual Studio 2013 and later supports the
C99 math functions we need, so we can clean things up a little bit.
build/win32/vs12/rsvg-build-defines.props | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/build/win32/vs12/rsvg-build-defines.props b/build/win32/vs12/rsvg-build-defines.props
index c5bb237..8549739 100644
--- a/build/win32/vs12/rsvg-build-defines.props
+++ b/build/win32/vs12/rsvg-build-defines.props
@@ -5,8 +5,8 @@
</ImportGroup>
<PropertyGroup Label="UserMacros">
<LibRsvgCFlags>G_LOG_DOMAIN="librsvg";RSVG_DISABLE_DEPRECATION_WARNINGS;RSVG_COMPILATION</LibRsvgCFlags>
-
<LibRsvgIncPath>$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\libcroco-0.6;$(GlibEtcInstallRoot)\include\libxml2;.\</LibRsvgIncPath>
- <LibRsvgLibs>pangocairo-1.0.lib;pango-1.0.lib;croco-0.6.lib;libxml2.lib</LibRsvgLibs>
+
<LibRsvgIncPath>$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\libcroco-0.6;$(GlibEtcInstallRoot)\include\libxml2</LibRsvgIncPath>
+
<LibRsvgLibs>$(SolutionDir)\$(Configuration)\$(Platform)\obj\rsvg_internals\$(Configuration)\rsvg_internals.lib;pangocairo-1.0.lib;pango-1.0.lib;croco-0.6.lib;libxml2.lib;userenv.lib;ws2_32.lib</LibRsvgLibs>
<IntlLib>intl.lib</IntlLib>
<Gtk3IncPath>$(GlibEtcInstallRoot)\include\gtk-3.0;$(GlibEtcInstallRoot)\include\atk-1.0;$(LibRsvgIncPath)</Gtk3IncPath>
<Gtk3Libs>gtk-3.0.lib;gdk-3.0.lib</Gtk3Libs>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]