Commit 624d6af3 authored by Chun-wei Fan's avatar Chun-wei Fan

NMake Makefiles: Make gettext-runtime libname configurable

Some people might be linking to gettext-runtime using intl.lib, while
others might be using libintl.lib (such as vcpkg builds), depending on
how gettext-runtime was built.  Add LIBINTL_LIB to the configurable
items, which defaults to intl.lib, in the NMake Makefiles so that we
can override it if needed in the NMake command line.

See #485 (comment 556977) for a
discussion on this.
parent 6fa53913
Pipeline #97430 failed with stages
in 33 minutes and 4 seconds
......@@ -95,6 +95,12 @@ for all targets.
generated using the 'install' build target.
-PKG_CONFIG: Path to your pkg-config (or compatible) tool, if not already in your
%PATH%. This is required for introspection builds.
-LIBINTL_LIB: Full file name of your gettext-runtime library .lib file, if it is not
intl.lib. This should be in the directories indicated by %LIB% or in
$(LIBDIR), or should be passed in with the full path. Note that its
DLL, if applicable, should be found in %PATH% or in $(BINDIR) as well,
for building the introspection files or for creating the GDK-Pixbuf
loaders cache file.
<other_options> is as follows, activate the options using <option>=1:
-INTROSPECTION: Build the introspection files. Please see notes above.
......
......@@ -7,7 +7,6 @@ RSVG_API_VER = $(RSVG_VER).0
CHECK_GIR_PACKAGE = gdk-pixbuf-2.0
RSVG_PKG_VERSION = @LIBRSVG_MAJOR_VERSION@.@LIBRSVG_MINOR_VERSION@.@LIBRSVG_MICRO_VERSION@
# Make bin, include and library directories of configurable
!ifndef BINDIR
BINDIR=$(PREFIX)\bin
......@@ -21,6 +20,11 @@ LIBDIR=$(PREFIX)\lib
INCLUDEDIR=$(PREFIX)\include
!endif
# Make import lib of gettext-runtime configurable
!ifndef LIBINTL_LIB
LIBINTL_LIB = intl.lib
!endif
LDFLAGS = $(LDFLAGS) /libpath:$(LIBDIR)
# These are the base minimum libraries required for building librsvg.
......@@ -52,7 +56,7 @@ BASE_DEP_LIBS = \
gobject-2.0.lib \
glib-2.0.lib \
cairo.lib \
intl.lib
$(LIBINTL_LIB)
LIBRSVG_LOG_DOMAIN = /DG_LOG_DOMAIN=\"librsvg\"
......
......@@ -70,8 +70,7 @@ help:
@echo.
@echo OPTION: Optional, may be any of the following, use OPTION=1 to enable;
@echo multiple OPTION's may be used. If no OPTION is specified, a default
@echo librsvg with the rsvg-view-3 utility program is built, without the
@echo introspection files.
@echo librsvg, without the introspection files.
@echo ======
@echo.
@echo INTROSPECTION:
......@@ -89,6 +88,14 @@ help:
@echo MinGW/autotools builds. Please note that this does not enable one to use
@echo this build with MinGW builds.
@echo ======
@echo.
@echo Other options:
@echo --------------
@echo LIBINTL_LIB: This defaults to intl.lib, which is the gettext-runtime library
@echo that we need to link to. Define this if your gettext-runtime library .lib is
@echo named differently, such as libintl.lib.
@echo ======
@echo.
@echo A 'clean' target is supported to remove all generated files, intermediate
@echo object files and binaries for the specified configuration.
@echo.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment