Repository.mk | 2 +- scp2/source/ooo/file_ooo.scp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit 809d724b6da3680f34f7e2e898aa72634a3331d7 Author: Tor Lillqvist <[email protected]> Date: Fri Mar 7 10:52:50 2014 +0200 Fix OS X build Change-Id: I9437bee64b318754ee5dc595f35be865a21d6a11 diff --git a/Repository.mk b/Repository.mk index 578ebd4c..a3df1b4 100644 --- a/Repository.mk +++ b/Repository.mk @@ -220,7 +220,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ canvastools \ chartcore \ chartcontroller \ - $(if $(filter $(OS),WNT),,cmdmail) \ + $(if $(filter $(OS),MACOSX WNT),,cmdmail) \ cppcanvas \ configmgr \ ctl \ diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 5597fe5..d08bb4c 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -200,7 +200,7 @@ End #endif -#ifdef UNX +#if defined UNX && ! defined MACOSX File gid_File_Bin_Uri_Encode BIN_FILE_BODY; @@ -211,14 +211,14 @@ End #endif -#ifdef UNX +#if defined UNX && ! defined MACOSX File gid_File_Bin_Senddoc BIN_FILE_BODY; Dir = FILELIST_DIR; Name = "shell_senddoc.filelist"; Styles = (FILELIST, PACKED); End -#else +#elif defined WNT File gid_File_Bin_Senddoc BIN_FILE_BODY; Dir = gid_Brand_Dir_Program; _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
