diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-24 19:22:58 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-24 19:22:58 +0200 |
| commit | d8fa35891160099d7b4f0f2069216899b214378d (patch) | |
| tree | ca7d676eac355d47ed6ede1dd6426af5f7b84aa6 /dbaccess/Library_dbu.mk | |
| parent | dae8595066271e6f07320c2181e495fab1e97ecd (diff) | |
| parent | 2835baa19e95af010673b9dfd3c92d5ab2474c80 (diff) | |
Merge branch 'master' into feature/gnumake4
Diffstat (limited to 'dbaccess/Library_dbu.mk')
| -rw-r--r-- | dbaccess/Library_dbu.mk | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk index 5c6b31e2043f..c90e3d320b32 100644 --- a/dbaccess/Library_dbu.mk +++ b/dbaccess/Library_dbu.mk @@ -56,8 +56,8 @@ $(eval $(call gb_Library_add_defs,dbu,\ endif ifeq ($(GUI)$(COM),WNTGCC) # for adoint.h -$(eval $(call gb_Library_set_cflags,dbu,\ - $$(CFLAGS) \ +$(eval $(call gb_Library_set_cxxflags,dbu,\ + $$(CXXFLAGS) \ -fpermissive \ )) endif @@ -286,17 +286,10 @@ $(eval $(call gb_Library_add_noexception_objects,dbu,\ )) ifeq ($(GUI),WNT) -ifneq (,$(strip $(WINDOWS_VISTA_PSDK))) -ifeq (,$(strip $(PROF_EDITION))) -dbu_DISABLE_ADO := $(true) -endif -endif -ifneq ($(dbu_DISABLE_ADO),$(true)) $(eval $(call gb_Library_add_noexception_objects,dbu,\ dbaccess/source/ui/dlg/adodatalinks \ )) endif -endif # workaround for issue http://qa.openoffice.org/issues/show_bug.cgi?id=102305 Linux specific ifeq ($(COM),GCC) |