external/firebird/ExternalProject_firebird.mk | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-)
New commits: commit ebe4259437254123697d6d62a4475f112efff31c Author: Lionel Elie Mamane <[email protected]> Date: Wed Aug 17 16:54:03 2016 +0200 fixup firebird with internal icu Change-Id: I38e44875234aa0c8382ab6e01b4f4c5cc16b834e diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk index 82de2d3..670041b 100644 --- a/external/firebird/ExternalProject_firebird.mk +++ b/external/firebird/ExternalProject_firebird.mk @@ -49,26 +49,24 @@ $(call gb_ExternalProject_get_state_target,firebird,build): -I$(call gb_UnpackedTarball_get_dir,libtommath) \ -L$(call gb_UnpackedTarball_get_dir,libtommath) \ ) \ - $(if $(filter WNT MACOSX,$(OS)), \ - $(if $(SYSTEM_ICU),$(ICU_CPPFLAGS), \ - -I$(call gb_UnpackedTarball_get_dir,icu)/source \ - -I$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \ - -I$(call gb_UnpackedTarball_get_dir,icu)/source/common \ - -L$(call gb_UnpackedTarball_get_dir,icu)/source/lib \ - )) \ + $(if $(SYSTEM_ICU),$(ICU_CPPFLAGS), \ + -I$(call gb_UnpackedTarball_get_dir,icu)/source \ + -I$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \ + -I$(call gb_UnpackedTarball_get_dir,icu)/source/common \ + -L$(call gb_UnpackedTarball_get_dir,icu)/source/lib \ + ) \ " \ && export CXXFLAGS=" \ $(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS), \ $(BOOST_CPPFLAGS) \ -L$(call gb_UnpackedTarball_get_dir,boost)/source/lib \ ) \ - $(if $(filter-out WNT MACOSX,$(OS)), \ - $(if $(SYSTEM_ICU),$(ICU_CPPFLAGS), \ - -I$(call gb_UnpackedTarball_get_dir,icu)/source \ - -I$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \ - -I$(call gb_UnpackedTarball_get_dir,icu)/source/common \ - -L$(call gb_UnpackedTarball_get_dir,icu)/source/lib \ - )) \ + $(if $(SYSTEM_ICU),$(ICU_CPPFLAGS), \ + -I$(call gb_UnpackedTarball_get_dir,icu)/source \ + -I$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \ + -I$(call gb_UnpackedTarball_get_dir,icu)/source/common \ + -L$(call gb_UnpackedTarball_get_dir,icu)/source/lib \ + ) \ $(if $(SYSTEM_LIBTOMMATH),$(LIBTOMMATH_CFLAGS), \ -L$(call gb_UnpackedTarball_get_dir,libtommath) \ ) \ _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
