diff options
Diffstat (limited to 'sal/Library_sal.mk')
-rw-r--r-- | sal/Library_sal.mk | 36 |
1 files changed, 14 insertions, 22 deletions
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index d783c84e39e9..2c67e85b90ef 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -128,29 +128,21 @@ $(eval $(call gb_Library_add_cxxflags,sal,\ )) endif -sal_textenc_code= \ - sal/textenc/context \ - sal/textenc/convertbig5hkscs \ - sal/textenc/converteuctw \ - sal/textenc/convertgb18030 \ - sal/textenc/convertisciidevangari \ - sal/textenc/convertiso2022cn \ - sal/textenc/convertiso2022jp \ - sal/textenc/convertiso2022kr \ - sal/textenc/convertsinglebytetobmpunicode \ - sal/textenc/tables \ - sal/textenc/tcvtbyte \ - sal/textenc/tcvtmb \ - sal/textenc/tcvtutf7 \ - -ifeq ($(OS),ANDROID) -$(eval $(call gb_Library_add_exception_objects,sal,\ - $(sal_textenc_code) \ -)) -else ifeq ($(DISABLE_DYNLOADING),TRUE) - +ifneq (,$(filter ANDROID iOS,$(OS))) $(eval $(call gb_Library_add_exception_objects,sal,\ - $(sal_textenc_code) \ + sal/textenc/context \ + sal/textenc/convertbig5hkscs \ + sal/textenc/converteuctw \ + sal/textenc/convertgb18030 \ + sal/textenc/convertisciidevangari \ + sal/textenc/convertiso2022cn \ + sal/textenc/convertiso2022jp \ + sal/textenc/convertiso2022kr \ + sal/textenc/convertsinglebytetobmpunicode \ + sal/textenc/tables \ + sal/textenc/tcvtbyte \ + sal/textenc/tcvtmb \ + sal/textenc/tcvtutf7 \ )) endif |