diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-21 18:32:46 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-21 18:32:46 +0200 |
| commit | 17a3c456b6e364ea50a0a0267235434421b76e4d (patch) | |
| tree | db74c4d9ced21b9fb89f5472973934a4d60161e1 /sc/Library_vbaobj.mk | |
| parent | 100fd14a70892a7c183574c3fc58672a04689211 (diff) | |
| parent | aca6b30d6406799561f311a38bbbfc1aebda36de (diff) | |
resyncing to master
Diffstat (limited to 'sc/Library_vbaobj.mk')
| -rw-r--r-- | sc/Library_vbaobj.mk | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk index 437607ddc949..eb66b6919fcb 100644 --- a/sc/Library_vbaobj.mk +++ b/sc/Library_vbaobj.mk @@ -29,7 +29,6 @@ $(eval $(call gb_Library_set_include,vbaobj,\ -I$(realpath $(SRCDIR)/sc/inc) \ -I$(WORKDIR)/Misc/sc/ \ $$(INCLUDE) \ - -I$(OUTDIR)/inc/offuh \ -I$(OUTDIR)/inc/ \ )) @@ -39,6 +38,12 @@ $(eval $(call gb_Library_add_defs,vbaobj,\ -DVBA_OOBUILD_HACK \ )) +$(eval $(call gb_Library_add_api,vbaobj,\ + offapi \ + oovbaapi \ + udkapi \ +)) + $(eval $(call gb_Library_add_linked_libs,vbaobj,\ comphelper \ cppu \ @@ -117,7 +122,6 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\ sc/source/ui/vba/vbaquerytable \ sc/source/ui/vba/vbarange \ sc/source/ui/vba/vbasheetobject \ - sc/source/ui/vba/vbasheetobjects \ sc/source/ui/vba/vbastyle \ sc/source/ui/vba/vbastyles \ sc/source/ui/vba/vbatextboxshape \ @@ -132,6 +136,17 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\ sc/source/ui/vba/vbawsfunction \ )) +#32bit Fedora gcc 4.6.1 fails to link sc without this +#TO-DO: make standalone reproducer for this and file +#gcc bug +ifeq ($(strip $(COM)),GCC) +$(eval $(call gb_Library_add_cxxobjects,vbaobj,\ + sc/source/ui/vba/vbasheetobjects \ + , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ +)) +else +$(eval $(call gb_Library_add_exception_objects,vbaobj,\ + sc/source/ui/vba/vbasheetobjects \ ifeq ($(OS),WNT) $(eval $(call gb_Library_add_linked_libs,vbaobj,\ advapi32 \ |