diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-11-09 09:27:19 +0100 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2012-11-09 09:27:28 +0100 |
| commit | 0aa1baa80b439740f176249d4f05007f715cf2b0 (patch) | |
| tree | 807de9d6eaac5dabbebcb98f5abb7b472b22b8d3 /lcms2 | |
| parent | 0f25bad134dbd103c614b1299e800e3be22d5e0d (diff) | |
Trying to fix lcms2 again
Change-Id: I376b03d12f8ae59fcf75046c42bcd6ba5d29af2c
Diffstat (limited to 'lcms2')
| -rw-r--r-- | lcms2/ExternalPackage_lcms2.mk | 2 | ||||
| -rw-r--r-- | lcms2/ExternalProject_lcms2.mk | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lcms2/ExternalPackage_lcms2.mk b/lcms2/ExternalPackage_lcms2.mk index 1d627366dc17..1500476590b8 100644 --- a/lcms2/ExternalPackage_lcms2.mk +++ b/lcms2/ExternalPackage_lcms2.mk @@ -17,7 +17,7 @@ $(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.a,src/.libs/liblcms else ifeq ($(OS),WNT) ifeq ($(COM),GCC) $(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.dll.a,src/.libs/liblcms2.dll.a)) -$(eval $(call gb_ExternalPackage_add_file,lcms2,bin/liblcms2.dll,src/.libs/liblcms2.dll)) +$(eval $(call gb_ExternalPackage_add_file,lcms2,bin/liblcms2-2.dll,src/.libs/liblcms2-2.dll)) else ifeq ($(COM),MSC) $(eval $(call gb_ExternalPackage_add_file,lcms2,lib/lcms2.lib,bin/lcms2.lib)) $(eval $(call gb_ExternalPackage_add_file,lcms2,bin/lcms2.dll,bin/lcms2.dll)) diff --git a/lcms2/ExternalProject_lcms2.mk b/lcms2/ExternalProject_lcms2.mk index 2703c382315b..c2fd8788e1d8 100644 --- a/lcms2/ExternalProject_lcms2.mk +++ b/lcms2/ExternalProject_lcms2.mk @@ -34,9 +34,9 @@ $(call gb_ExternalProject_get_state_target,lcms2,build): cd $(EXTERNAL_WORKDIR) \ && ./configure --without-jpeg --without-tiff --with-pic \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - $(if $(filter-out WNTGCC,$(OS)$(COM)),,LDFLAGS="-Wl,--export-all-symbols -Wl,--enable-stdcall-fixup -Wl,--enable-runtime-pseudo-reloc-v2") \ CPPFLAGS=" $(SOLARINC)" \ - $(if $(filter IOS ANDROID,$(OS)),--disable-shared, --enable-shared --disable-static) \ + $(if $(filter-out WNTGCC,$(OS)$(COM)),,CPPFLAGS=" -DCMS_DLL_BUILD") \ + $(if $(filter IOS ANDROID,$(OS)), --disable-shared --enable-static, --enable-shared --disable-static) \ && cd src \ && $(MAKE) \ && touch $@ |