mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix build issues in canvas on windows

Browse Source
This commit is contained in:
Norbert Thiebaud 2011-08-12 19:45:10 +02:00
parent 25027d0ba3
commit 0471520e8d
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
canvas/Library_directx5canvas.mk
View File

@ -32,9 +32,9 @@ $(eval $(call gb_Library_set_componentfile,directx5canvas,canvas/source/directx/
$(eval $(call gb_Library_set_include,directx5canvas,\ $(eval $(call gb_Library_set_include,directx5canvas,\
$$(INCLUDE) \ $$(INCLUDE) \
-I$(realpath $(SRCDIR)/canvas/inc) \ -I$(SRCDIR)/canvas/inc \
-I$(realpath $(SRCDIR)/canvas/inc/pch) \ -I$(SRCDIR)/canvas/inc/pch \
-I$(realpath $(SRCDIR)/canvas/source/directx) \ -I$(SRCDIR)/canvas/source/directx \
)) ))
$(eval $(call gb_Library_add_api,directx5canvas,\ $(eval $(call gb_Library_add_api,directx5canvas,\
@ -51,7 +51,6 @@ $(eval $(call gb_Library_add_linked_libs,directx5canvas,\
sal \ sal \
comphelper \ comphelper \
cppuhelper \ cppuhelper \
stl \
basegfx \ basegfx \
canvastools \ canvastools \
vcl \ vcl \

10
canvas/Library_directx9canvas.mk
View File

@ -32,8 +32,13 @@ $(eval $(call gb_Library_set_componentfile,directx9canvas,canvas/source/directx/
$(eval $(call gb_Library_set_include,directx9canvas,\ $(eval $(call gb_Library_set_include,directx9canvas,\
$$(INCLUDE) \ $$(INCLUDE) \
-I$(realpath $(SRCDIR)/canvas/inc) \ -I$(SRCDIR)/canvas/inc \
-I$(realpath $(SRCDIR)/canvas/inc/pch) \ -I$(SRCDIR)/canvas/inc/pch \
))
$(eval $(call gb_Library_add_api,directx9canvas,\
offapi \
udkapi \
)) ))
$(eval $(call gb_Library_add_defs,directx9canvas,\ $(eval $(call gb_Library_add_defs,directx9canvas,\
@ -46,7 +51,6 @@ $(eval $(call gb_Library_add_linked_libs,directx9canvas,\
sal \ sal \
comphelper \ comphelper \
cppuhelper \ cppuhelper \
stl \
basegfx \ basegfx \
canvastools \ canvastools \
vcl \ vcl \

5
canvas/Library_gdipluscanvas.mk
View File

@ -32,8 +32,8 @@ $(eval $(call gb_Library_set_componentfile,gdipluscanvas,canvas/source/directx/g
$(eval $(call gb_Library_set_include,gdipluscanvas,\ $(eval $(call gb_Library_set_include,gdipluscanvas,\
$$(INCLUDE) \ $$(INCLUDE) \
-I$(realpath $(SRCDIR)/canvas/inc) \ -I$(SRCDIR)/canvas/inc \
-I$(realpath $(SRCDIR)/canvas/inc/pch) \ -I$(SRCDIR)/canvas/inc/pch \
)) ))
$(eval $(call gb_Library_add_api,gdipluscanvas,\ $(eval $(call gb_Library_add_api,gdipluscanvas,\
@ -57,7 +57,6 @@ $(eval $(call gb_Library_add_linked_libs,gdipluscanvas,\
sal \ sal \
comphelper \ comphelper \
cppuhelper \ cppuhelper \
stl \
basegfx \ basegfx \
canvastools \ canvastools \
vcl \ vcl \