Eliminate un-used DIRECTX5
This commit is contained in:
Norbert Thiebaud
parent
45d211b599
commit
69b6ca8ed5
@ -1,103 +0,0 @@
|
||||
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
|
||||
#*************************************************************************
|
||||
#
|
||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
#
|
||||
# Copyright 2000, 2011 Oracle and/or its affiliates.
|
||||
#
|
||||
# OpenOffice.org - a multi-platform office productivity suite
|
||||
#
|
||||
# This file is part of OpenOffice.org.
|
||||
#
|
||||
# OpenOffice.org is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Lesser General Public License version 3
|
||||
# only, as published by the Free Software Foundation.
|
||||
#
|
||||
# OpenOffice.org is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU Lesser General Public License version 3 for more details
|
||||
# (a copy is included in the LICENSE file that accompanied this code).
|
||||
#
|
||||
# You should have received a copy of the GNU Lesser General Public License
|
||||
# version 3 along with OpenOffice.org. If not, see
|
||||
# <http://www.openoffice.org/license.html>
|
||||
# for a copy of the LGPLv3 License.
|
||||
#
|
||||
#*************************************************************************
|
||||
|
||||
$(eval $(call gb_Library_Library,directx5canvas))
|
||||
|
||||
$(eval $(call gb_Library_set_componentfile,directx5canvas,canvas/source/directx/directx5canvas))
|
||||
|
||||
$(eval $(call gb_Library_set_include,directx5canvas,\
|
||||
$$(INCLUDE) \
|
||||
-I$(SRCDIR)/canvas/inc \
|
||||
-I$(SRCDIR)/canvas/source/directx \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_api,directx5canvas,\
|
||||
offapi \
|
||||
udkapi \
|
||||
))
|
||||
|
||||
# clear NOMINMAX because GdiplusTypes.h uses those macros :(
|
||||
$(eval $(call gb_Library_add_defs,directx5canvas,\
|
||||
-DDIRECTX_VERSION=0x0500 \
|
||||
-UNOMINMAX \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,directx5canvas,\
|
||||
cppu \
|
||||
tk \
|
||||
sal \
|
||||
comphelper \
|
||||
cppuhelper \
|
||||
basegfx \
|
||||
canvastools \
|
||||
vcl \
|
||||
tl \
|
||||
utl \
|
||||
i18nisolang1 \
|
||||
$(gb_STDLIBS) \
|
||||
))
|
||||
|
||||
ifeq ($(OS),WNT)
|
||||
$(eval $(call gb_Library_add_linked_libs,directx5canvas,\
|
||||
d3dx \
|
||||
gdi32 \
|
||||
gdiplus \
|
||||
ddraw \
|
||||
))
|
||||
endif
|
||||
|
||||
$(WORKDIR)/CustomTarget/canvas/source/directx/%.cxx : $(SRCDIR)/canvas/source/directx/%.cxx
|
||||
mkdir -p $(dir $@) && \
|
||||
cp $< $@
|
||||
|
||||
$(eval $(call gb_Library_add_generated_exception_objects,directx5canvas,\
|
||||
CustomTarget/canvas/source/directx/dx_5rm \
|
||||
CustomTarget/canvas/source/directx/dx_bitmap \
|
||||
CustomTarget/canvas/source/directx/dx_bitmapcanvashelper \
|
||||
CustomTarget/canvas/source/directx/dx_canvasbitmap \
|
||||
CustomTarget/canvas/source/directx/dx_canvascustomsprite \
|
||||
CustomTarget/canvas/source/directx/dx_canvasfont \
|
||||
CustomTarget/canvas/source/directx/dx_canvashelper \
|
||||
CustomTarget/canvas/source/directx/dx_canvashelper_texturefill \
|
||||
CustomTarget/canvas/source/directx/dx_config \
|
||||
CustomTarget/canvas/source/directx/dx_devicehelper \
|
||||
CustomTarget/canvas/source/directx/dx_gdiplususer \
|
||||
CustomTarget/canvas/source/directx/dx_impltools \
|
||||
CustomTarget/canvas/source/directx/dx_linepolypolygon \
|
||||
CustomTarget/canvas/source/directx/dx_spritecanvas \
|
||||
CustomTarget/canvas/source/directx/dx_spritecanvashelper \
|
||||
CustomTarget/canvas/source/directx/dx_spritedevicehelper \
|
||||
CustomTarget/canvas/source/directx/dx_spritehelper \
|
||||
CustomTarget/canvas/source/directx/dx_surfacebitmap \
|
||||
CustomTarget/canvas/source/directx/dx_surfacegraphics \
|
||||
CustomTarget/canvas/source/directx/dx_textlayout \
|
||||
CustomTarget/canvas/source/directx/dx_textlayout_drawhelper \
|
||||
CustomTarget/canvas/source/directx/dx_vcltools \
|
||||
))
|
||||
|
||||
# vim: set noet sw=4 ts=4:
|
||||
@ -46,12 +46,6 @@ endif
|
||||
ifeq ($(strip $(OS)),WNT)
|
||||
ifneq ($(strip $(ENABLE_DIRECTX)),)
|
||||
|
||||
ifneq ($(strip $(USE_DIRECTX5)),)
|
||||
$(eval $(call gb_Module_add_targets,canvas,\
|
||||
Library_directx5canvas \
|
||||
))
|
||||
endif
|
||||
|
||||
$(eval $(call gb_Module_add_targets,canvas,\
|
||||
Library_directx9canvas \
|
||||
Library_gdipluscanvas \
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!--**********************************************************************
|
||||
*
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* Copyright 2000, 2010 Oracle and/or its affiliates.
|
||||
*
|
||||
* OpenOffice.org - a multi-platform office productivity suite
|
||||
*
|
||||
* This file is part of OpenOffice.org.
|
||||
*
|
||||
* OpenOffice.org is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License version 3
|
||||
* only, as published by the Free Software Foundation.
|
||||
*
|
||||
* OpenOffice.org is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License version 3 for more details
|
||||
* (a copy is included in the LICENSE file that accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* version 3 along with OpenOffice.org. If not, see
|
||||
* <http://www.openoffice.org/license.html>
|
||||
* for a copy of the LGPLv3 License.
|
||||
*
|
||||
**********************************************************************-->
|
||||
|
||||
<component loader="com.sun.star.loader.SharedLibrary" prefix="directx5canvas"
|
||||
xmlns="http://openoffice.org/2010/uno-components">
|
||||
<implementation name="com.sun.star.comp.rendering.SpriteCanvas.DX5">
|
||||
<service name="com.sun.star.rendering.SpriteCanvas.DX5"/>
|
||||
</implementation>
|
||||
</component>
|
||||
File diff suppressed because it is too large
Load Diff
@ -343,10 +343,6 @@ my_components += \
|
||||
component/canvas/source/directx/gdipluscanvas
|
||||
.END
|
||||
|
||||
.IF "$(OS)" == "WNT" && "$(ENABLE_DIRECTX)" != "" && "$(USE_DIRECTX5)" != ""
|
||||
my_components += component/canvas/source/directx/directx5canvas
|
||||
.END
|
||||
|
||||
.IF "$(OS)" != "MACOSX" && "$(SYSTEM_MOZILLA)" != "YES" && \
|
||||
"$(WITH_MOZILLA)" != "NO"
|
||||
my_components += mozab
|
||||
|
||||
@ -28,9 +28,6 @@
|
||||
#include "macros.inc"
|
||||
|
||||
#ifdef WNT
|
||||
# ifdef USE_DIRECTX5
|
||||
SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_DirectX5Canvas,directx5canvas.uno)
|
||||
# endif
|
||||
SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_DirectX9Canvas, directx9canvas.uno)
|
||||
SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_GdiPlusCanvas, gdipluscanvas.uno)
|
||||
#endif
|
||||
|
||||
@ -46,9 +46,6 @@ PARFILES+= cairocanvas.par
|
||||
.ENDIF
|
||||
|
||||
.IF "$(ENABLE_DIRECTX)" != ""
|
||||
.IF "$(USE_DIRECTX5)" != ""
|
||||
SCPDEFS+=-DUSE_DIRECTX5
|
||||
.ENDIF
|
||||
PARFILES+= directxcanvas.par
|
||||
.ENDIF
|
||||
|
||||
|
||||
@ -169,7 +169,6 @@ if ( $platform =~ m/cygwin|mingw32/ )
|
||||
$SHOWINCLUDES_PREFIX = '@SHOWINCLUDES_PREFIX@';
|
||||
$WINDOWS_SDK_HOME = PathFormat('@WINDOWS_SDK_HOME@');
|
||||
$DIRECTXSDK_LIB = PathFormat('@DIRECTXSDK_LIB@');
|
||||
$USE_DIRECTX5 = "";
|
||||
$DOTNET_FRAMEWORK_HOME = PathFormat('@DOTNET_FRAMEWORK_HOME@');
|
||||
$wps = ';' if '@build_os@' eq 'cygwin'; # Windows style path seperator
|
||||
}
|
||||
@ -735,7 +734,6 @@ if ( $platform =~ m/cygwin/ )
|
||||
{ ToFile( "CYGWIN_PATH", $CYGWIN_PATH, "e" );
|
||||
ToFile( "WINDOWS_SDK_HOME", $WINDOWS_SDK_HOME, "e" );
|
||||
ToFile( "DIRECTXSDK_LIB", $DIRECTXSDK_LIB, "e" );
|
||||
ToFile( "USE_DIRECTX5", $USE_DIRECTX5, "e" );
|
||||
ToFile( "DISABLE_ACTIVEX", "@DISABLE_ACTIVEX@","e" );
|
||||
ToFile( "DISABLE_ATL", "@DISABLE_ATL@","e" );
|
||||
ToFile( "INCLUDE", "", "e" );
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user