canvas/Library_directx9canvas.mk | 1 - canvas/Library_gdipluscanvas.mk | 1 - canvas/StaticLibrary_directxcanvas.mk | 1 - canvas/source/directx/dx_9rm.cxx | 4 ---- canvas/source/directx/dx_winstuff.hxx | 4 ---- 5 files changed, 11 deletions(-)
New commits: commit 7594c0c29d8f81c74d3e181e0197cf31c492a42e Author: Michael Stahl <[email protected]> Date: Wed Dec 10 18:22:28 2014 +0100 canvas: DIRECTX_VERSION macro is obsolete It was only checked by our own code, and only DirectX 9 is supported. Change-Id: I03035f87969301624df011cb4d76c6a9532f3c99 diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk index 5621cee..64ff646 100644 --- a/canvas/Library_directx9canvas.mk +++ b/canvas/Library_directx9canvas.mk @@ -25,7 +25,6 @@ $(eval $(call gb_Library_use_sdk_api,directx9canvas)) # clear NOMINMAX because GdiplusTypes.h uses those macros :( $(eval $(call gb_Library_add_defs,directx9canvas,\ - -DDIRECTX_VERSION=0x0900 \ -UNOMINMAX \ )) diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk index 2e12d4d..fdb3927 100644 --- a/canvas/Library_gdipluscanvas.mk +++ b/canvas/Library_gdipluscanvas.mk @@ -27,7 +27,6 @@ $(eval $(call gb_Library_use_sdk_api,gdipluscanvas)) # clear NOMINMAX because GdiplusTypes.h uses those macros :( $(eval $(call gb_Library_add_defs,gdipluscanvas,\ - -DDIRECTX_VERSION=0x0900 \ -UNOMINMAX \ )) diff --git a/canvas/StaticLibrary_directxcanvas.mk b/canvas/StaticLibrary_directxcanvas.mk index da7f380..8b14d0b 100644 --- a/canvas/StaticLibrary_directxcanvas.mk +++ b/canvas/StaticLibrary_directxcanvas.mk @@ -19,7 +19,6 @@ $(eval $(call gb_StaticLibrary_use_api,directxcanvas,\ # clear NOMINMAX because GdiplusTypes.h uses those macros :( $(eval $(call gb_StaticLibrary_add_defs,directxcanvas,\ - -DDIRECTX_VERSION=0x0900 \ -UNOMINMAX \ )) diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx index f679bd1..e9fd666 100644 --- a/canvas/source/directx/dx_9rm.cxx +++ b/canvas/source/directx/dx_9rm.cxx @@ -18,8 +18,6 @@ */ -#if DIRECTX_VERSION == 0x0900 - #define MAX_TEXTURE_SIZE (2048) #define MIN_TEXTURE_SIZE (32) //#define FAKE_MAX_NUMBER_TEXTURES (2) @@ -1342,6 +1340,4 @@ namespace dxcanvas } } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/directx/dx_winstuff.hxx b/canvas/source/directx/dx_winstuff.hxx index b7c9d8e..7b7f3c2 100644 --- a/canvas/source/directx/dx_winstuff.hxx +++ b/canvas/source/directx/dx_winstuff.hxx @@ -38,10 +38,6 @@ # define D3D_DEBUG_INFO #endif -#ifndef DIRECTX_VERSION -#error please define for which directx version we should compile -#endif - #if defined _MSC_VER #pragma warning(push,1) #endif _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
