diff options
| author | Vladimir Glazunov <vg@openoffice.org> | 2009-11-30 17:03:57 +0100 |
|---|---|---|
| committer | Vladimir Glazunov <vg@openoffice.org> | 2009-11-30 17:03:57 +0100 |
| commit | 2bc1a6dcdc4b9ea4f14c9648387855af288a4aed (patch) | |
| tree | 7ad87840cfb718617b8e26621a4da12d9a62de14 | |
| parent | 9dc3b523990a426644fab1a7288317f62404232b (diff) | |
#i106757#
Notes
Notes:
split repo tag: bootstrap_ooo/DEV300_m66
| -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 16855101dfd2..a49efd11958f 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" |