[Libreoffice-commits] .: canvas/Library_directx5canvas.mk canvas/Library_directx9canvas.mk canvas/Library_gdipluscanvas.mk

[Norbert Thiebaud]

 canvas/Library_directx5canvas.mk |    7 +++----
 canvas/Library_directx9canvas.mk |   10 +++++++---
 canvas/Library_gdipluscanvas.mk  |    5 ++---
 3 files changed, 12 insertions(+), 10 deletions(-)

New commits:
commit 0471520e8d583f017ebb1703704be4da4444da3c
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Fri Aug 12 19:45:10 2011 +0200

    fix build issues in canvas on windows

diff --git a/canvas/Library_directx5canvas.mk b/canvas/Library_directx5canvas.mk
index f27391d..a24a668 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$(realpath $(SRCDIR)/canvas/inc) \
-	-I$(realpath $(SRCDIR)/canvas/inc/pch) \
-	-I$(realpath $(SRCDIR)/canvas/source/directx) \
+	-I$(SRCDIR)/canvas/inc \
+	-I$(SRCDIR)/canvas/inc/pch \
+	-I$(SRCDIR)/canvas/source/directx \
 ))
 
 $(eval $(call gb_Library_add_api,directx5canvas,\
@@ -51,7 +51,6 @@ $(eval $(call gb_Library_add_linked_libs,directx5canvas,\
 	sal \
 	comphelper \
 	cppuhelper \
-	stl \
 	basegfx \
 	canvastools \
 	vcl \
diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk
index ac50505..3790595 100644
--- a/canvas/Library_directx9canvas.mk
+++ b/canvas/Library_directx9canvas.mk
@@ -32,8 +32,13 @@ $(eval $(call gb_Library_set_componentfile,directx9canvas,canvas/source/directx/
 
 $(eval $(call gb_Library_set_include,directx9canvas,\
 	$$(INCLUDE) \
-	-I$(realpath $(SRCDIR)/canvas/inc) \
-	-I$(realpath $(SRCDIR)/canvas/inc/pch) \
+	-I$(SRCDIR)/canvas/inc \
+	-I$(SRCDIR)/canvas/inc/pch \
+))
+
+$(eval $(call gb_Library_add_api,directx9canvas,\
+    offapi \
+    udkapi \
 ))
 
 $(eval $(call gb_Library_add_defs,directx9canvas,\
@@ -46,7 +51,6 @@ $(eval $(call gb_Library_add_linked_libs,directx9canvas,\
 	sal \
 	comphelper \
 	cppuhelper \
-	stl \
 	basegfx \
 	canvastools \
 	vcl \
diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk
index 3a16a48..c099c98 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$(realpath $(SRCDIR)/canvas/inc) \
-	-I$(realpath $(SRCDIR)/canvas/inc/pch) \
+	-I$(SRCDIR)/canvas/inc \
+	-I$(SRCDIR)/canvas/inc/pch \
 ))
 
 $(eval $(call gb_Library_add_api,gdipluscanvas,\
@@ -57,7 +57,6 @@ $(eval $(call gb_Library_add_linked_libs,gdipluscanvas,\
 	sal \
 	comphelper \
 	cppuhelper \
-	stl \
 	basegfx \
 	canvastools \
 	vcl \