[Libreoffice-commits] .: sc/AllLangResTarget_sc.mk sc/inc sc/Library_scd.mk sc/Library_scfilt.mk sc/Library_sc.mk sc/Library_scui.mk sc/Library_vbaobj.mk

[Fridrich Strba]

 sc/AllLangResTarget_sc.mk |   16 ++++++++--------
 sc/Library_sc.mk          |   14 +++++++-------
 sc/Library_scd.mk         |    4 ++--
 sc/Library_scfilt.mk      |   10 +++++-----
 sc/Library_scui.mk        |   10 +++++-----
 sc/Library_vbaobj.mk      |   10 +++++-----
 sc/inc/filter.hxx         |    2 +-
 7 files changed, 33 insertions(+), 33 deletions(-)

New commits:
commit 01b5772eed5c0ae880ec887a2a4dedd490f8b18a
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue Mar 29 14:10:18 2011 +0200

    Fix Windows build of SC

diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk
index 64fdfd4..8039494 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 7abb7b0..dc3879c 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 fd8e71d..9802911 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 ad9df6e..70f23fa 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 402ea08..f8d5610 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 a364913..ef230f9 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 8ea4e97..72c5ea5 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 {