diff options
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/InstallModule_ooo.mk | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index 573ee85f42f7..92042aca55c4 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -19,7 +19,6 @@ $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/ooo,ooo)) $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ DISABLE_ATL \ - DISABLE_NEON \ ENABLE_CAIRO_CANVAS \ ENABLE_DIRECTX \ ENABLE_EVOAB2 \ @@ -59,7 +58,6 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ SYSTEM_LIBXSLT \ SYSTEM_LUCENE \ SYSTEM_MYTHES \ - SYSTEM_NEON \ SYSTEM_NSS \ SYSTEM_OPENSSL \ SYSTEM_PANGO \ diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 3716a13fe9b3..ad5acb517ffd 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -829,11 +829,8 @@ File gid_File_Lib_Ucpchelp1 Styles = (PACKED); End -#ifndef DISABLE_NEON -SPECIAL_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1) - #ifndef SYSTEM_NEON - SPECIAL_LIB_FILE(gid_File_Lib_Neon,neon) - #endif +#ifdef NEED_NEON +SPECIAL_LIB_FILE(gid_File_Lib_Neon,neon) #endif #if !defined(ANDROID) && !defined(IOS) //FIXME: get nss&xmlsec building |