[Libreoffice-commits] core.git: sw/ooxmlexport_setup.mk

[Takeshi Abe]

 sw/ooxmlexport_setup.mk |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 3c42024f467ec9110be751e9af49d025ecc17182
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Mon Jan 4 17:38:16 2016 +0900

    WIP: Fix build with --disable-atl on Windows
    
    This avoids finding emboleobj's component in such case.
    
    Change-Id: Ie1bdef629a55b4ddb6be2538939867c182c184b3
    Reviewed-on: https://gerrit.libreoffice.org/21075
    Reviewed-by: Matúš Kukan <matus at libreoffice.org>
    Tested-by: Matúš Kukan <matus at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sw/ooxmlexport_setup.mk b/sw/ooxmlexport_setup.mk
index 9c89c28..94cee42 100644
--- a/sw/ooxmlexport_setup.mk
+++ b/sw/ooxmlexport_setup.mk
@@ -33,7 +33,12 @@ define sw_ooxmlexport_components
 	dbaccess/util/dba \
 	drawinglayer/drawinglayer \
 	embeddedobj/util/embobj \
-	embeddedobj/source/msole/emboleobj$(if $(filter WNT,$(OS)),.windows) \
+	$(if $(filter WNT,$(OS)), \
+		$(if $(DISABLE_ATL),, \
+			embeddedobj/source/msole/emboleobj.windows \
+		), \
+		embeddedobj/source/msole/emboleobj \
+	) \
 	filter/source/config/cache/filterconfig1 \
 	filter/source/odfflatxml/odfflatxml \
 	filter/source/xmlfilterdetect/xmlfd \