summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-02-09 22:39:42 +0100
committerTor Lillqvist <tml@iki.fi>2013-02-11 13:03:18 +0000
commit92e7811ee757db41dc0b428aa1fe1f3ba3797bac (patch)
treeaea207755a7e25e5214d2276d669ef967b73bbba /scp2
parent7d4e28739681ca947112332016f9e904d4e587c9 (diff)
fdo#60491: scp2: always package emboleobj library on non-WNT platforms
(regression from 09cd5c460704ddd99669a61ae335bfb2ce357140, which defined DISABLE_ATL on all platforms in configure) (cherry picked from commit ca8ac449e3524f895de1e94a3c5d511591031b40) Conflicts: postprocess/Rdb_services.mk Change-Id: If2373386102373cb49e8cd0c6bf807da2f805dda Reviewed-on: https://gerrit.libreoffice.org/2095 Reviewed-by: Tor Lillqvist <tml@iki.fi> Tested-by: Tor Lillqvist <tml@iki.fi>
Diffstat (limited to 'scp2')
-rw-r--r--scp2/source/ooo/file_library_ooo.scp3
1 files changed, 2 insertions, 1 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 642cd81504df..6dd5e298c96f 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -394,7 +394,8 @@ STD_LIB_FILE(gid_File_Lib_Drawinglayer,drawinglayer)
SPECIAL_LIB_FILE(gid_File_Lib_Embobj,embobj)
-#ifndef DISABLE_ATL
+/* fdo#60491 always need emboleobj library on non-WNT platforms */
+#if !defined(WNT) || !defined(DISABLE_ATL)
SPECIAL_LIB_FILE(gid_File_Lib_Emboleobj,emboleobj)
#endif