summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorFridrich Štrba <fridrich.strba@bluewin.ch>2011-03-29 14:10:18 +0200
committerFridrich Štrba <fridrich.strba@bluewin.ch>2011-03-29 14:10:18 +0200
commit3d2893926b01a3681801e5787df7a41a3e427c36 (patch)
tree44ec134ec1a01786b7f21760e98c34ebbed34cd7 /sc
parentfdf18984ddf8c922d28fa095a950ebd3f42dde7f (diff)
Fix Windows build of SC
Diffstat (limited to 'sc')
-rw-r--r--sc/AllLangResTarget_sc.mk16
-rw-r--r--sc/Library_sc.mk14
-rw-r--r--sc/Library_scd.mk4
-rw-r--r--sc/Library_scfilt.mk10
-rw-r--r--sc/Library_scui.mk10
-rw-r--r--sc/Library_vbaobj.mk10
-rw-r--r--sc/inc/filter.hxx2
7 files changed, 33 insertions, 33 deletions
diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk
index 64fdfd4139c2..80394946da37 100644
--- a/sc/AllLangResTarget_sc.mk
+++ b/sc/AllLangResTarget_sc.mk
@@ -32,14 +32,14 @@ $(eval $(call gb_SrsTarget_set_include,sc/res,\
$$(INCLUDE) \
-I$(OUTDIR)/inc \
-I$(WORKDIR)/inc/sc \
- -I$(SRCDIR)/sc/inc \
- -I$(SRCDIR)/sc/source/ui/wrtsh \
- -I$(SRCDIR)/sc/source/ui/inc \
- -I$(SRCDIR)/sc/source/ui/navipi \
- -I$(SRCDIR)/sc/source/ui/docshell \
- -I$(SRCDIR)/sc/source/ui/pagedlg \
- -I$(SRCDIR)/sc/source/ui/dbgui \
- -I$(SRCDIR)/sc/source/ui/formdlg \
+ -I$(realpath $(SRCDIR)/sc/inc) \
+ -I$(realpath $(SRCDIR)/sc/source/ui/wrtsh) \
+ -I$(realpath $(SRCDIR)/sc/source/ui/inc) \
+ -I$(realpath $(SRCDIR)/sc/source/ui/navipi) \
+ -I$(realpath $(SRCDIR)/sc/source/ui/docshell) \
+ -I$(realpath $(SRCDIR)/sc/source/ui/pagedlg) \
+ -I$(realpath $(SRCDIR)/sc/source/ui/dbgui) \
+ -I$(realpath $(SRCDIR)/sc/source/ui/formdlg) \
))
$(eval $(call gb_SrsTarget_add_files,sc/res,\
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 7abb7b0983a2..dc3879c591cc 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -28,11 +28,11 @@ $(eval $(call gb_Library_add_precompiled_header,sc,$(SRCDIR)/sc/inc/pch/precompi
$(eval $(call gb_Library_set_componentfile,sc,sc/util/sc))
$(eval $(call gb_Library_set_include,sc,\
- -I$(SRCDIR)/sc/source/core/inc \
- -I$(SRCDIR)/sc/source/filter/inc \
- -I$(SRCDIR)/sc/source/ui/inc \
- -I$(SRCDIR)/sc/inc/pch \
- -I$(SRCDIR)/sc/inc \
+ -I$(realpath $(SRCDIR)/sc/source/core/inc) \
+ -I$(realpath $(SRCDIR)/sc/source/filter/inc) \
+ -I$(realpath $(SRCDIR)/sc/source/ui/inc) \
+ -I$(realpath $(SRCDIR)/sc/inc/pch) \
+ -I$(realpath $(SRCDIR)/sc/inc) \
-I$(WORKDIR)/SdiTarget/sc/sdi \
-I$(WORKDIR)/Misc/sc/ \
$$(INCLUDE) \
@@ -602,7 +602,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
$(eval $(call gb_SdiTarget_SdiTarget,sc/sdi/scslots,sc/sdi/scalc))
$(eval $(call gb_SdiTarget_set_include,sc/sdi/scslots,\
- -I$(SRCDIR)/sc/inc \
- -I$(SRCDIR)/sc/sdi \
+ -I$(realpath $(SRCDIR)/sc/inc) \
+ -I$(realpath $(SRCDIR)/sc/sdi) \
$$(INCLUDE) \
))
diff --git a/sc/Library_scd.mk b/sc/Library_scd.mk
index fd8e71dc61ab..9802911ea1ed 100644
--- a/sc/Library_scd.mk
+++ b/sc/Library_scd.mk
@@ -26,8 +26,8 @@ $(eval $(call gb_Library_add_precompiled_header,scd,$(SRCDIR)/sc/inc/pch/precomp
$(eval $(call gb_Library_set_componentfile,scd,sc/util/scd))
$(eval $(call gb_Library_set_include,scd,\
- -I$(SRCDIR)/sc/inc/pch \
- -I$(SRCDIR)/sc/inc \
+ -I$(realpath $(SRCDIR)/sc/inc/pch) \
+ -I$(realpath $(SRCDIR)/sc/inc) \
-I$(WORKDIR)/Misc/sc/ \
$$(INCLUDE) \
-I$(OUTDIR)/inc/offuh \
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index ad9df6e0dee4..70f23fa4e352 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -24,11 +24,11 @@ $(eval $(call gb_Library_Library,scfilt))
$(eval $(call gb_Library_add_precompiled_header,sc,$(SRCDIR)/sc/source/filter/inc/filt_pch))
$(eval $(call gb_Library_set_include,scfilt,\
- -I$(SRCDIR)/sc/source/core/inc \
- -I$(SRCDIR)/sc/source/filter/inc \
- -I$(SRCDIR)/sc/source/ui/inc \
- -I$(SRCDIR)/sc/inc \
- -I$(SRCDIR)/sc/inc/pch \
+ -I$(realpath $(SRCDIR)/sc/source/core/inc) \
+ -I$(realpath $(SRCDIR)/sc/source/filter/inc) \
+ -I$(realpath $(SRCDIR)/sc/source/ui/inc) \
+ -I$(realpath $(SRCDIR)/sc/inc) \
+ -I$(realpath $(SRCDIR)/sc/inc/pch) \
-I$(WORKDIR)/Misc/sc/ \
$$(INCLUDE) \
-I$(OUTDIR)/inc/offuh \
diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk
index 402ea080aaf3..f8d561094626 100644
--- a/sc/Library_scui.mk
+++ b/sc/Library_scui.mk
@@ -22,11 +22,11 @@
$(eval $(call gb_Library_Library,scui))
$(eval $(call gb_Library_set_include,scui,\
- -I$(SRCDIR)/sc/inc \
- -I$(SRCDIR)/sc/inc/pch \
- -I$(SRCDIR)/sc/source/core/inc \
- -I$(SRCDIR)/sc/source/filter/inc \
- -I$(SRCDIR)/sc/source/ui/inc \
+ -I$(realpath $(SRCDIR)/sc/inc) \
+ -I$(realpath $(SRCDIR)/sc/inc/pch) \
+ -I$(realpath $(SRCDIR)/sc/source/core/inc) \
+ -I$(realpath $(SRCDIR)/sc/source/filter/inc) \
+ -I$(realpath $(SRCDIR)/sc/source/ui/inc) \
-I$(WORKDIR)/SdiTarget/sc/sdi \
-I$(WORKDIR)/Misc/sc \
$$(INCLUDE) \
diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk
index a3649131ef2d..ef230f96aaf9 100644
--- a/sc/Library_vbaobj.mk
+++ b/sc/Library_vbaobj.mk
@@ -22,11 +22,11 @@
$(eval $(call gb_Library_Library,vbaobj))
$(eval $(call gb_Library_set_include,vbaobj,\
- -I$(SRCDIR)/sc/source/core/inc \
- -I$(SRCDIR)/sc/source/filter/inc \
- -I$(SRCDIR)/sc/source/ui/inc \
- -I$(SRCDIR)/sc/inc/pch \
- -I$(SRCDIR)/sc/inc \
+ -I$(realpath $(SRCDIR)/sc/source/core/inc) \
+ -I$(realpath $(SRCDIR)/sc/source/filter/inc) \
+ -I$(realpath $(SRCDIR)/sc/source/ui/inc) \
+ -I$(realpath $(SRCDIR)/sc/inc/pch) \
+ -I$(realpath $(SRCDIR)/sc/inc) \
-I$(WORKDIR)/Misc/sc/ \
$$(INCLUDE) \
-I$(OUTDIR)/inc/offuh \
diff --git a/sc/inc/filter.hxx b/sc/inc/filter.hxx
index 6a119a8570c0..f868b70715a9 100644
--- a/sc/inc/filter.hxx
+++ b/sc/inc/filter.hxx
@@ -130,7 +130,7 @@ class ScFormatFilterPlugin {
// scfilt plugin symbol
extern "C" {
- ScFormatFilterPlugin * SAL_CALL ScFilterCreate(void);
+ SAL_DLLPUBLIC_EXPORT ScFormatFilterPlugin * SAL_CALL ScFilterCreate(void);
}
class ScFormatFilter {