diff options
| author | Niklas Johansson <sleeping.pillow@gmail.com> | 2013-09-01 16:06:57 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-09-01 19:26:41 +0000 |
| commit | 907445612298aae4f3322a7d9cdc6871d54ba47a (patch) | |
| tree | 39d0747855645f04980aa30169592303799fd036 | |
| parent | b81d16d79990dccf263367356826a30f23439367 (diff) | |
Make it possible to build without ATL
Change-Id: I381934bc00273da7bf359610bb471ec4cbc49545
Reviewed-on: https://gerrit.libreoffice.org/5740
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | embedserv/Module_embedserv.mk | 2 | ||||
| -rw-r--r-- | sw/CppunitTest_sw_ww8export.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/embedserv/Module_embedserv.mk b/embedserv/Module_embedserv.mk index 009d63ed3b45..fc1119012473 100644 --- a/embedserv/Module_embedserv.mk +++ b/embedserv/Module_embedserv.mk @@ -13,7 +13,7 @@ $(eval $(call gb_Module_Module,embedserv)) ifeq ($(OS),WNT) $(eval $(call gb_Module_add_targets,embedserv,\ - Library_inprocserv \ + $(if $(filter WNT-TRUE,$(OS)-$(DISABLE_ATL)),,Library_inprocserv) \ )) ifeq ($(DISABLE_ATL),) diff --git a/sw/CppunitTest_sw_ww8export.mk b/sw/CppunitTest_sw_ww8export.mk index c75d92928579..2b1a4751f20d 100644 --- a/sw/CppunitTest_sw_ww8export.mk +++ b/sw/CppunitTest_sw_ww8export.mk @@ -19,7 +19,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sw_ww8export, \ comphelper \ cppu \ cppuhelper \ - emboleobj \ + $(if $(filter WNT-TRUE,$(OS)-$(DISABLE_ATL)),,emboleobj) \ sal \ test \ unotest \ |