[Libreoffice-commits] .: 2 commits - Repository.mk canvas/Library_directx9canvas.mk canvas/Library_gdipluscanvas.mk canvas/Module_canvas.mk canvas/StaticLibrary_directxcanvas.mk ucb/Library_ucpodma1.mk
Michael Stahl
mst at kemper.freedesktop.org
Wed Mar 14 13:10:38 PDT 2012
Repository.mk | 1
canvas/Library_directx9canvas.mk | 19 ++--------
canvas/Library_gdipluscanvas.mk | 19 ++--------
canvas/Module_canvas.mk | 1
canvas/StaticLibrary_directxcanvas.mk | 62 ++++++++++++++++++++++++++++++++++
ucb/Library_ucpodma1.mk | 5 ++
6 files changed, 76 insertions(+), 31 deletions(-)
New commits:
commit a13a88bd2c673d059b60e339dcf3b8fabf991f18
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Mar 14 21:08:03 2012 +0100
fdo#47246: canvas: split out static library directxcanvas
diff --git a/Repository.mk b/Repository.mk
index 147eca9..6f1b12c 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -84,6 +84,7 @@ $(eval $(call gb_Helper_register_executables,OOO,\
))
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+ directxcanvas \
winextendloaderenv \
winlauncher \
))
diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk
index 070df09..0b1da59 100644
--- a/canvas/Library_directx9canvas.mk
+++ b/canvas/Library_directx9canvas.mk
@@ -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:
diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk
index 7531d75..3be70e5 100644
--- a/canvas/Library_gdipluscanvas.mk
+++ b/canvas/Library_gdipluscanvas.mk
@@ -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:
diff --git a/canvas/Module_canvas.mk b/canvas/Module_canvas.mk
index 8595611..e7aad78 100644
--- a/canvas/Module_canvas.mk
+++ b/canvas/Module_canvas.mk
@@ -49,6 +49,7 @@ ifneq ($(strip $(ENABLE_DIRECTX)),)
$(eval $(call gb_Module_add_targets,canvas,\
Library_directx9canvas \
Library_gdipluscanvas \
+ StaticLibrary_directxcanvas \
))
endif
diff --git a/canvas/StaticLibrary_directxcanvas.mk b/canvas/StaticLibrary_directxcanvas.mk
new file mode 100644
index 0000000..cd74a2c
--- /dev/null
+++ b/canvas/StaticLibrary_directxcanvas.mk
@@ -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 at 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:
commit 16e3e5437efe38308615d42924baa735f94b2484
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Mar 14 20:49:35 2012 +0100
fdo#47246: ucpodma: fix duplicate linked object
diff --git a/ucb/Library_ucpodma1.mk b/ucb/Library_ucpodma1.mk
index aa6c81c..ef60121 100644
--- a/ucb/Library_ucpodma1.mk
+++ b/ucb/Library_ucpodma1.mk
@@ -43,12 +43,15 @@ $(eval $(call gb_Library_add_linked_libs,ucpodma1,\
$(gb_STDLIBS) \
))
+$(eval $(call gb_Library_add_linked_static_libs,ucpodma1,\
+ odma_lib \
+))
+
$(eval $(call gb_Library_add_exception_objects,ucpodma1,\
ucb/source/ucp/odma/odma_contentcaps \
ucb/source/ucp/odma/odma_content \
ucb/source/ucp/odma/odma_datasupplier \
ucb/source/ucp/odma/odma_inputstream \
- ucb/source/ucp/odma/odma_lib \
ucb/source/ucp/odma/odma_provider \
ucb/source/ucp/odma/odma_resultset \
ucb/source/ucp/odma/odma_services \
More information about the Libreoffice-commits
mailing list