diff options
| author | Isamu Mogi <saturday6c@gmail.com> | 2013-12-18 20:52:45 +0900 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2014-06-10 16:33:58 +0100 |
| commit | d6f4b60b3fbedb22c46e7c4c3370a74b649e187f (patch) | |
| tree | a02af119a113a4a925bd82e9466ec899bb9efcd5 | |
| parent | b977c542b16e3789d93d1c3b261288634e29f718 (diff) | |
--disable-atl disables winaccessibility
Change-Id: I548ea294e6c632b8ae95e6745a51d9b12c7e5297
Reviewed-on: https://gerrit.libreoffice.org/7130
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
| -rwxr-xr-x | postprocess/Rdb_services.mk | 2 | ||||
| -rw-r--r-- | winaccessibility/Module_winaccessibility.mk | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index c291401851e0..9f4927e93cb1 100755 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -140,7 +140,6 @@ $(eval $(call gb_Rdb_add_components,services,\ shell/source/win32/simplemail/smplmail \ shell/source/win32/syssh \ vcl/vcl.windows \ - winaccessibility/source/service/winaccessibility \ ) \ $(if $(ENABLE_HEADLESS), \ vcl/vcl.headless \ @@ -153,6 +152,7 @@ $(eval $(call gb_Rdb_add_components,services,\ embeddedobj/source/msole/emboleobj.windows \ embedserv/util/emser \ extensions/source/ole/oleautobridge \ + winaccessibility/source/service/winaccessibility \ ) \ ) \ $(if $(WITH_WEBDAV), \ diff --git a/winaccessibility/Module_winaccessibility.mk b/winaccessibility/Module_winaccessibility.mk index 2421164b34bd..19490a6991f9 100644 --- a/winaccessibility/Module_winaccessibility.mk +++ b/winaccessibility/Module_winaccessibility.mk @@ -11,12 +11,14 @@ $(eval $(call gb_Module_Module,winaccessibility)) ifeq ($(OS),WNT) ifeq ($(COM),MSC) +ifeq ($(DISABLE_ATL),) $(eval $(call gb_Module_add_targets,winaccessibility,\ WinResTarget_uacccom \ CustomTarget_ia2_idl \ Library_uacccom \ Library_winaccessibility \ )) +endif # !DISABLE_ATL endif # COM=MSC endif # WNT |