diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-08-12 19:45:10 +0200 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-08-12 13:08:40 -0500 |
| commit | 0471520e8d583f017ebb1703704be4da4444da3c (patch) | |
| tree | 8dbc34a6b9bba9d4c551dec5814ef8267c4b5c05 | |
| parent | 25027d0ba3b5c6fc421330a3157330545c05d7bc (diff) | |
fix build issues in canvas on windows
| -rw-r--r-- | canvas/Library_directx5canvas.mk | 7 | ||||
| -rw-r--r-- | canvas/Library_directx9canvas.mk | 10 | ||||
| -rw-r--r-- | canvas/Library_gdipluscanvas.mk | 5 |
3 files changed, 12 insertions, 10 deletions
diff --git a/canvas/Library_directx5canvas.mk b/canvas/Library_directx5canvas.mk index f27391d6e03c..a24a6688bb91 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 ac505057b671..37905954b0db 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 3a16a482d096..c099c98059a0 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 \ |