help windows build along

10 files changed, 20 insertions, 21 deletions

diff --git a/basebmp/Library_basebmp.mk b/basebmp/Library_basebmp.mk
index c8e3d3a2b5..1730cc2763 100644
--- a/basebmp/Library_basebmp.mk
+++ b/basebmp/Library_basebmp.mk
@@ -31,8 +31,7 @@ $(eval $(call gb_Library_Library,basebmp))
 $(eval $(call gb_Library_add_package_headers,basebmp,basebmp_inc))
 
 $(eval $(call gb_Library_set_include,basebmp,\
-	-I$(SRCDIR)/basebmp/inc/ \
-	-I$(SRCDIR)/basebmp/inc/pch \
+	-I$(realpath $(SRCDIR)/basebmp/inc/) \
 	$$(INCLUDE) \
 ))
 
diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk
index ea4ae72101..a83be4387b 100644
--- a/canvas/Library_cairocanvas.mk
+++ b/canvas/Library_cairocanvas.mk
@@ -32,8 +32,8 @@ $(eval $(call gb_Library_set_componentfile,cairocanvas,canvas/source/cairo/cairo
 
 $(eval $(call gb_Library_set_include,cairocanvas,\
 	$$(INCLUDE) \
-	-I$(SRCDIR)/canvas/inc \
-	-I$(SRCDIR)/canvas/inc/pch \
+	-I$(realpath $(SRCDIR)/canvas/inc) \
+	-I$(realpath $(SRCDIR)/canvas/inc/pch) \
 ))
 
 $(eval $(call gb_Library_add_api,cairocanvas,\
diff --git a/canvas/Library_canvasfactory.mk b/canvas/Library_canvasfactory.mk
index 0175ea909e..0d96fb53ab 100644
--- a/canvas/Library_canvasfactory.mk
+++ b/canvas/Library_canvasfactory.mk
@@ -32,8 +32,8 @@ $(eval $(call gb_Library_set_componentfile,canvasfactory,canvas/source/factory/c
 
 $(eval $(call gb_Library_set_include,canvasfactory,\
 	$$(INCLUDE) \
-	-I$(SRCDIR)/canvas/inc \
-	-I$(SRCDIR)/canvas/inc/pch \
+	-I$(realpath $(SRCDIR)/canvas/inc) \
+	-I$(realpath $(SRCDIR)/canvas/inc/pch) \
 ))
 
 $(eval $(call gb_Library_add_api,canvasfactory,\
diff --git a/canvas/Library_canvastools.mk b/canvas/Library_canvastools.mk
index 67fc48d707..3caca89082 100644
--- a/canvas/Library_canvastools.mk
+++ b/canvas/Library_canvastools.mk
@@ -34,8 +34,8 @@ $(eval $(call gb_Library_add_precompiled_header,canvastools,$(SRCDIR)/canvas/inc
 
 $(eval $(call gb_Library_set_include,canvastools,\
 	$$(INCLUDE) \
-	-I$(SRCDIR)/canvas/inc \
-	-I$(SRCDIR)/canvas/inc/pch \
+	-I$(realpath $(SRCDIR)/canvas/inc) \
+	-I$(realpath $(SRCDIR)/canvas/inc/pch) \
 ))
 
 $(eval $(call gb_Library_add_api,canvastools,\
diff --git a/canvas/Library_directx5canvas.mk b/canvas/Library_directx5canvas.mk
index 634872cf44..aeb31cc2a7 100644
--- a/canvas/Library_directx5canvas.mk
+++ b/canvas/Library_directx5canvas.mk
@@ -32,9 +32,9 @@ $(eval $(call gb_Library_set_componentfile,directx5canvas,canvas/source/directx/
 
 $(eval $(call gb_Library_set_include,directx5canvas,\
 	$$(INCLUDE) \
-	-I$(SRCDIR)/canvas/inc \
-	-I$(SRCDIR)/canvas/inc/pch \
-	-I$(SRCDIR)/canvas/source/directx \
+	-I$(realpath $(SRCDIR)/canvas/inc) \
+	-I$(realpath $(SRCDIR)/canvas/inc/pch) \
+	-I$(realpath $(SRCDIR)/canvas/source/directx) \
 ))
 
 $(eval $(call gb_Library_add_api,directx5canvas,\
diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk
index 83d1b0eef9..05d28c7852 100644
--- a/canvas/Library_directx9canvas.mk
+++ b/canvas/Library_directx9canvas.mk
@@ -32,8 +32,8 @@ $(eval $(call gb_Library_set_componentfile,directx9canvas,canvas/source/directx/
 
 $(eval $(call gb_Library_set_include,directx9canvas,\
 	$$(INCLUDE) \
-	-I$(SRCDIR)/canvas/inc \
-	-I$(SRCDIR)/canvas/inc/pch \
+	-I$(realpath $(SRCDIR)/canvas/inc) \
+	-I$(realpath $(SRCDIR)/canvas/inc/pch) \
 ))
 
 $(eval $(call gb_Library_add_defs,directx9canvas,\
diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk
index 67dd1c4c08..bb7d9d1989 100644
--- a/canvas/Library_gdipluscanvas.mk
+++ b/canvas/Library_gdipluscanvas.mk
@@ -32,8 +32,8 @@ $(eval $(call gb_Library_set_componentfile,gdipluscanvas,canvas/source/directx/g
 
 $(eval $(call gb_Library_set_include,gdipluscanvas,\
 	$$(INCLUDE) \
-	-I$(SRCDIR)/canvas/inc \
-	-I$(SRCDIR)/canvas/inc/pch \
+	-I$(realpath $(SRCDIR)/canvas/inc) \
+	-I$(realpath $(SRCDIR)/canvas/inc/pch) \
 ))
 
 $(eval $(call gb_Library_add_api,gdipluscanvas,\
diff --git a/canvas/Library_nullcanvas.mk b/canvas/Library_nullcanvas.mk
index 473e3911b8..a2b19828da 100644
--- a/canvas/Library_nullcanvas.mk
+++ b/canvas/Library_nullcanvas.mk
@@ -30,8 +30,8 @@ $(eval $(call gb_Library_Library,nullcanvas))
 
 $(eval $(call gb_Library_set_include,nullcanvas,\
 	$$(INCLUDE) \
-	-I$(SRCDIR)/canvas/inc \
-	-I$(SRCDIR)/canvas/inc/pch \
+	-I$(realpath $(SRCDIR)/canvas/inc) \
+	-I$(realpath $(SRCDIR)/canvas/inc/pch) \
 ))
 
 $(eval $(call gb_Library_add_api,nullcanvas,\
diff --git a/canvas/Library_simplecanvas.mk b/canvas/Library_simplecanvas.mk
index 22fa304f84..376a3dba54 100644
--- a/canvas/Library_simplecanvas.mk
+++ b/canvas/Library_simplecanvas.mk
@@ -32,8 +32,8 @@ $(eval $(call gb_Library_set_componentfile,simplecanvas,canvas/source/simplecanv
 
 $(eval $(call gb_Library_set_include,simplecanvas,\
 	$$(INCLUDE) \
-	-I$(SRCDIR)/canvas/inc \
-	-I$(SRCDIR)/canvas/inc/pch \
+	-I$(realpath $(SRCDIR)/canvas/inc) \
+	-I$(realpath $(SRCDIR)/canvas/inc/pch) \
 ))
 
 $(eval $(call gb_Library_add_api,simplecanvas,\
diff --git a/canvas/Library_vclcanvas.mk b/canvas/Library_vclcanvas.mk
index b539200220..4461c5ec0b 100644
--- a/canvas/Library_vclcanvas.mk
+++ b/canvas/Library_vclcanvas.mk
@@ -32,8 +32,8 @@ $(eval $(call gb_Library_set_componentfile,vclcanvas,canvas/source/vcl/vclcanvas
 
 $(eval $(call gb_Library_set_include,vclcanvas,\
 	$$(INCLUDE) \
-	-I$(SRCDIR)/canvas/inc \
-	-I$(SRCDIR)/canvas/inc/pch \
+	-I$(realpath $(SRCDIR)/canvas/inc) \
+	-I$(realpath $(SRCDIR)/canvas/inc/pch) \
 ))
 
 $(eval $(call gb_Library_add_api,vclcanvas,\