diff options
author | mb93783 <mb93783@v60x-so15.Germany.Sun.COM> | 2009-12-02 12:43:33 +0100 |
---|---|---|
committer | mb93783 <mb93783@v60x-so15.Germany.Sun.COM> | 2009-12-02 12:43:33 +0100 |
commit | 7895564df9f6b970c35c6ceb0ec800daf0b8329d (patch) | |
tree | 8f12e78fcdd6d75aea091ab44a87a53e1c7068b8 /scp2/source | |
parent | e794771234bd31b55374204636a788d39519741d (diff) | |
parent | 2bc1a6dcdc4b9ea4f14c9648387855af288a4aed (diff) |
merge to m66
Diffstat (limited to 'scp2/source')
-rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 3 | ||||
-rw-r--r-- | scp2/source/ooo/makefile.mk | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index c8fa64d75052..fbba63d826e0 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1561,6 +1561,9 @@ End #ifndef DISABLE_NEON SPECIAL_UNO_LIB_FILE_PATCH(gid_File_Lib_Ucpdav1,ucpdav1) + #ifndef SYSTEM_NEON + SPECIAL_LIB_FILE(gid_File_Lib_Neon,neon) + #endif #endif SPECIAL_UNO_LIB_FILE_PATCH(gid_File_Lib_Ucpfile1,ucpfile1) diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index 0d85cc529b63..24027743d58a 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -212,6 +212,9 @@ SCPDEFS+=-DISOLANG_MAJOR=$(ISOLANG_MAJOR) .IF "$(DISABLE_NEON)" == "TRUE" SCPDEFS+=-DDISABLE_NEON .ENDIF +.IF "$(SYSTEM_NEON)" == "YES" +SCPDEFS+=-DSYSTEM_NEON +.ENDIF # if yes or unset (neon not used) -> do not install openssl library! .IF $(SYSTEM_OPENSSL) != "YES" |