[Libreoffice-commits] .: basebmp/Library_basebmp.mk canvas/Library_cairocanvas.mk canvas/Library_canvasfactory.mk canvas/Library_canvastools.mk canvas/Library_directx5canvas.mk canvas/Library_directx9canvas.mk canvas/Library_gdipluscanvas.mk canvas/Library_nullcanvas.mk canvas/Library_simplecanvas.mk canvas/Library_vclcanvas.mk
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Aug 4 04:13:18 PDT 2011
basebmp/Library_basebmp.mk | 3 +--
canvas/Library_cairocanvas.mk | 4 ++--
canvas/Library_canvasfactory.mk | 4 ++--
canvas/Library_canvastools.mk | 4 ++--
canvas/Library_directx5canvas.mk | 6 +++---
canvas/Library_directx9canvas.mk | 4 ++--
canvas/Library_gdipluscanvas.mk | 4 ++--
canvas/Library_nullcanvas.mk | 4 ++--
canvas/Library_simplecanvas.mk | 4 ++--
canvas/Library_vclcanvas.mk | 4 ++--
10 files changed, 20 insertions(+), 21 deletions(-)
New commits:
commit dc1e658c2e051ee96a2537de5f4044b3d4093590
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Aug 4 12:13:06 2011 +0100
help windows build along
diff --git a/basebmp/Library_basebmp.mk b/basebmp/Library_basebmp.mk
index c8e3d3a..1730cc2 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 ea4ae72..a83be43 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 0175ea9..0d96fb5 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 67fc48d..3caca89 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 634872c..aeb31cc 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 83d1b0e..05d28c7 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 67dd1c4..bb7d9d1 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 473e391..a2b1982 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 22fa304..376a3db 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 b539200..4461c5e 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,\
More information about the Libreoffice-commits
mailing list