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

fdo#47246: canvas: split out static library directxcanvas

Browse Source
This commit is contained in:
Michael Stahl
2012-03-14 21:08:03 +01:00
parent 16e3e5437e
commit a13a88bd2c
5 changed files with 72 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Repository.mk
View File

@@ -84,6 +84,7 @@ $(eval $(call gb_Helper_register_executables,OOO,\
))
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
directxcanvas \
winextendloaderenv \
winlauncher \
))

19
canvas/Library_directx9canvas.mk
View File

@@ -61,37 +61,26 @@ $(eval $(call gb_Library_add_linked_libs,directx9canvas,\
$(gb_STDLIBS) \
))
ifeq ($(OS),WNT)
$(eval $(call gb_Library_add_linked_libs,directx9canvas,\
d3d9 \
gdi32 \
gdiplus \
))
endif
$(eval $(call gb_Library_add_linked_static_libs,directx9canvas,\
directxcanvas \
))
$(eval $(call gb_Library_add_exception_objects,directx9canvas,\
canvas/source/directx/dx_9rm \
canvas/source/directx/dx_bitmap \
canvas/source/directx/dx_bitmapcanvashelper \
canvas/source/directx/dx_canvasbitmap \
canvas/source/directx/dx_canvascustomsprite \
canvas/source/directx/dx_canvasfont \
canvas/source/directx/dx_canvashelper \
canvas/source/directx/dx_canvashelper_texturefill \
canvas/source/directx/dx_config \
canvas/source/directx/dx_devicehelper \
canvas/source/directx/dx_gdiplususer \
canvas/source/directx/dx_impltools \
canvas/source/directx/dx_linepolypolygon \
canvas/source/directx/dx_spritecanvas \
canvas/source/directx/dx_spritecanvashelper \
canvas/source/directx/dx_spritedevicehelper \
canvas/source/directx/dx_spritehelper \
canvas/source/directx/dx_surfacebitmap \
canvas/source/directx/dx_surfacegraphics \
canvas/source/directx/dx_textlayout \
canvas/source/directx/dx_textlayout_drawhelper \
canvas/source/directx/dx_vcltools \
))
# vim: set noet sw=4 ts=4:

19
canvas/Library_gdipluscanvas.mk
View File

@@ -67,28 +67,17 @@ $(eval $(call gb_Library_add_linked_libs,gdipluscanvas,\
$(gb_STDLIBS) \
))
ifeq ($(OS),WNT)
$(eval $(call gb_Library_add_linked_libs,gdipluscanvas,\
gdi32 \
gdiplus \
))
endif
$(eval $(call gb_Library_add_linked_static_libs,gdipluscanvas,\
directxcanvas \
))
$(eval $(call gb_Library_add_exception_objects,gdipluscanvas,\
canvas/source/directx/dx_bitmap \
canvas/source/directx/dx_bitmapcanvashelper \
canvas/source/directx/dx_canvas \
canvas/source/directx/dx_canvasbitmap \
canvas/source/directx/dx_canvasfont \
canvas/source/directx/dx_canvashelper \
canvas/source/directx/dx_canvashelper_texturefill \
canvas/source/directx/dx_devicehelper \
canvas/source/directx/dx_gdiplususer \
canvas/source/directx/dx_impltools \
canvas/source/directx/dx_linepolypolygon \
canvas/source/directx/dx_textlayout \
canvas/source/directx/dx_textlayout_drawhelper \
canvas/source/directx/dx_vcltools \
))
# vim: set noet sw=4 ts=4:

1
canvas/Module_canvas.mk
View File

@@ -49,6 +49,7 @@ ifneq ($(strip $(ENABLE_DIRECTX)),)
$(eval $(call gb_Module_add_targets,canvas,\
Library_directx9canvas \
Library_gdipluscanvas \
StaticLibrary_directxcanvas \
))
endif

62
canvas/StaticLibrary_directxcanvas.mk Normal file
View File

@@ -0,0 +1,62 @@
# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
# the License or as specified alternatively below. You may obtain a copy of
# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
# Major Contributor(s):
# [ Copyright (C) 2012 Red Hat, Inc., Michael Stahl <mstahl@redhat.com> (initial developer) ]
#
# All Rights Reserved.
#
# For minor contributions see the git repository.
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
$(eval $(call gb_StaticLibrary_StaticLibrary,directxcanvas))
$(eval $(call gb_StaticLibrary_set_include,directxcanvas,\
$$(INCLUDE) \
-I$(SRCDIR)/canvas/inc \
))
$(eval $(call gb_StaticLibrary_add_api,directxcanvas,\
offapi \
udkapi \
))
# clear NOMINMAX because GdiplusTypes.h uses those macros :(
$(eval $(call gb_StaticLibrary_add_defs,directxcanvas,\
-DDIRECTX_VERSION=0x0900 \
-UNOMINMAX \
))
$(eval $(call gb_StaticLibrary_add_noexception_objects,directxcanvas,\
canvas/source/directx/dx_bitmap \
canvas/source/directx/dx_bitmapcanvashelper \
canvas/source/directx/dx_canvasbitmap \
canvas/source/directx/dx_canvasfont \
canvas/source/directx/dx_canvashelper \
canvas/source/directx/dx_canvashelper_texturefill \
canvas/source/directx/dx_devicehelper \
canvas/source/directx/dx_gdiplususer \
canvas/source/directx/dx_impltools \
canvas/source/directx/dx_linepolypolygon \
canvas/source/directx/dx_textlayout \
canvas/source/directx/dx_textlayout_drawhelper \
canvas/source/directx/dx_vcltools \
))
# vim:set shiftwidth=4 softtabstop=4 expandtab: