diff options
| author | Jürgen Schmidt <jsc@apache.org> | 2011-11-14 12:35:07 +0000 |
|---|---|---|
| committer | Jürgen Schmidt <jsc@apache.org> | 2011-11-14 12:35:07 +0000 |
| commit | 3360d33d73a80c1c114af3e34ad7867e0388e9be (patch) | |
| tree | 267a42f5b186e33a99e1ef5f4017cb4edfe52230 /scp2 | |
| parent | d931eec926f50f5f4facba1febaf168a3fb300f4 (diff) | |
118584: remove internal neon and dependencies, build webdav ucp only if system neon is enabled
Diffstat (limited to 'scp2')
| -rwxr-xr-x | scp2/source/ooo/file_library_ooo.scp | 5 | ||||
| -rw-r--r-- | scp2/source/ooo/makefile.mk | 3 |
2 files changed, 1 insertions, 7 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index a995bcbaf652..2cc7a8c44c86 100755 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1396,11 +1396,8 @@ File gid_File_Lib_Ucpchelp1 Styles = (PACKED); End -#ifndef DISABLE_NEON +#ifdef SYSTEM_NEON SPECIAL_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1) - #ifndef SYSTEM_NEON - SPECIAL_LIB_FILE(gid_File_Lib_Neon,neon) - #endif #endif SPECIAL_LIB_FILE(gid_File_Lib_Ucpfile1,ucpfile1) diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index 0777c72a78cc..9550b58fba2a 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -223,9 +223,6 @@ SCPDEFS+=\ SCPDEFS+=-DISOLANG_MAJOR=$(ISOLANG_MAJOR) -.IF "$(DISABLE_NEON)" == "TRUE" -SCPDEFS+=-DDISABLE_NEON -.ENDIF .IF "$(SYSTEM_NEON)" == "YES" SCPDEFS+=-DSYSTEM_NEON .ENDIF |