diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-03-07 10:52:50 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-03-26 16:37:44 +0200 |
| commit | 809d724b6da3680f34f7e2e898aa72634a3331d7 (patch) | |
| tree | 0460a27c5c18a40b7f3d9f9528a0c1647afc0960 | |
| parent | d90ae06e55c07db964c70c9cce462a174228a1ca (diff) | |
Fix OS X build
Change-Id: I9437bee64b318754ee5dc595f35be865a21d6a11
| -rw-r--r-- | Repository.mk | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Repository.mk b/Repository.mk index 578ebd4c0d2b..a3df1b4ea3dd 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 5597fe5701d4..d08bb4cadc50 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; |