diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2016-01-04 17:38:16 +0900 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-01-06 14:31:55 +0000 |
| commit | 3c42024f467ec9110be751e9af49d025ecc17182 (patch) | |
| tree | 919ceb8fd5cc6eabbbae41e248b24b1adb82c462 /sw | |
| parent | da952d821dcc08b017bdef8f7b06f60befd2effa (diff) | |
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@libreoffice.org>
Tested-by: Matúš Kukan <matus@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/ooxmlexport_setup.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sw/ooxmlexport_setup.mk b/sw/ooxmlexport_setup.mk index 9c89c28dd433..94cee426e2fb 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 \ |