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

canvas: remove Windows SDK #ifdefs - all supported MSVC/SDK have DirectX

Browse Source 
Change-Id: I5106593ad5472992e3607665849fb35802b6e266
This commit is contained in:
Michael Stahl 2014-12-10 17:45:00 +01:00
parent 67f5fa5a23
commit ff17c5a2b0
5 changed files with 2 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
canvas/Library_directx9canvas.mk
View File

@ -29,12 +29,6 @@ $(eval $(call gb_Library_add_defs,directx9canvas,\
-UNOMINMAX \ -UNOMINMAX \
)) ))
ifneq ($(filter 80 81,$(WINDOWS_SDK_VERSION)),)
$(eval $(call gb_Library_add_defs,directx9canvas,\
-DWIN8_SDK=1 \
))
endif
$(eval $(call gb_Library_use_external,directx9canvas,boost_headers)) $(eval $(call gb_Library_use_external,directx9canvas,boost_headers))
$(eval $(call gb_Library_use_libraries,directx9canvas,\ $(eval $(call gb_Library_use_libraries,directx9canvas,\

6
canvas/Library_gdipluscanvas.mk
View File

@ -31,12 +31,6 @@ $(eval $(call gb_Library_add_defs,gdipluscanvas,\
-UNOMINMAX \ -UNOMINMAX \
)) ))
ifneq ($(filter 80 81,$(WINDOWS_SDK_VERSION)),)
$(eval $(call gb_Library_add_defs,gdipluscanvas,\
-DWIN8_SDK=1 \
))
endif
ifneq ($(strip $(VERBOSE)$(verbose)),) ifneq ($(strip $(VERBOSE)$(verbose)),)
$(eval $(call gb_Library_add_defs,gdipluscanvas,\ $(eval $(call gb_Library_add_defs,gdipluscanvas,\
-DVERBOSE \ -DVERBOSE \

6
canvas/StaticLibrary_directxcanvas.mk
View File

@ -23,12 +23,6 @@ $(eval $(call gb_StaticLibrary_add_defs,directxcanvas,\
-UNOMINMAX \ -UNOMINMAX \
)) ))
ifneq ($(filter 80 81,$(WINDOWS_SDK_VERSION)),)
$(eval $(call gb_StaticLibrary_add_defs,directxcanvas,\
-DWIN8_SDK=1 \
))
endif
$(eval $(call gb_StaticLibrary_add_exception_objects,directxcanvas,\ $(eval $(call gb_StaticLibrary_add_exception_objects,directxcanvas,\
canvas/source/directx/dx_bitmap \ canvas/source/directx/dx_bitmap \
canvas/source/directx/dx_bitmapcanvashelper \ canvas/source/directx/dx_bitmapcanvashelper \

20
canvas/source/directx/dx_winstuff.hxx
View File

@ -56,26 +56,10 @@
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#if WIN8_SDK == 1 || defined(_USING_V110_SDK71_) #include <d3d9.h>
#include <d3d9.h> typedef IDirect3DSurface9 surface_type;
typedef IDirect3DSurface9 surface_type;
#else
#include <dxsdkver.h>
#include <d3d9.h>
#include <d3dx9.h>
#if _DXSDK_BUILD_MAJOR < 1734 /* Earlier than the August 2009 DXSDK */
#include <dxerr9.h>
#else
#include <dxerr.h>
#endif
typedef IDirect3DSurface9 surface_type;
#endif
#undef DrawText #undef DrawText

1
solenv/gbuild/platform/com_MSC_defs.mk
View File

@ -47,7 +47,6 @@ gb_COMPILERDEFS := \
-D_MT \ -D_MT \
-D_DLL \ -D_DLL \
-DCPPU_ENV=$(gb_CPPU_ENV) \ -DCPPU_ENV=$(gb_CPPU_ENV) \
$(if $(findstring 120_70,$(VCVER)_$(WINDOWS_SDK_VERSION)),-D_USING_V110_SDK71_) \
ifeq ($(CPUNAME),INTEL) ifeq ($(CPUNAME),INTEL)
gb_COMPILERDEFS += \ gb_COMPILERDEFS += \