# HG changeset patch # User Michael Goffioul # Date 1372463760 14400 # Node ID b8e2aa2141e5a47b389f749d054aa2e2b30f7f68 # Parent 728a29b9306035fa9159571a13e9a431b8e31eb1 [MSVC] enable libmng compilation - discard lcms1 dependency, libmng does not support lcms2 and lcms1 does not compile easily with MSVC (ancient libtool version used) diff -r 728a29b93060 -r b8e2aa2141e5 src/libmng.mk --- a/src/libmng.mk Thu Jun 27 21:52:26 2013 -0400 +++ b/src/libmng.mk Fri Jun 28 19:56:00 2013 -0400 @@ -7,7 +7,10 @@ $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)-devel/$($(PKG)_VERSION)/$($(PKG)_FILE) -$(PKG)_DEPS := zlib jpeg lcms1 +$(PKG)_DEPS := zlib jpeg +ifneq ($(MXE_SYSTEM),msvc) + $(PKG)_DEPS += lcms1 +endif define $(PKG)_UPDATE $(WGET) -q -O- 'http://sourceforge.net/projects/libmng/files/libmng-devel/' | \ @@ -24,12 +27,12 @@ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' \ - --enable-shared + --enable-shared && $(CONFIGURE_POST_HOOK) $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install $(SED) -e 's^@prefix@^$(HOST_PREFIX)^;' \ -e 's^@VERSION@^$(libmng_VERSION)^;' \ -e 's^@mng_libs_private@^-ljpeg^;' \ - -e 's^@mng_requires_private@^lcms zlib^;' \ + -e 's^@mng_requires_private@^lcms2 zlib^;' \ < '$(1)/libmng.pc.in' > '$(1)/libmng.pc' $(INSTALL) -m644 '$(1)/libmng.pc' '$(HOST_LIBDIR)/pkgconfig/' endef