Skip to content

C
core
Kaydet (Commit) 0aa1baa8 authored tarafından Fridrich Štrba's avatar Fridrich Štrba
Dosyalara gözat
Seçenekler

Trying to fix lcms2 again 

Change-Id: I376b03d12f8ae59fcf75046c42bcd6ba5d29af2c
üst 0f25bad1
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
lcms2/ExternalPackage_lcms2.mk
Dosyayı görüntüle @ 0aa1baa8
......@@ -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))
......
lcms2/ExternalProject_lcms2.mk
Dosyayı görüntüle @ 0aa1baa8
......@@ -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 $@
......
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