Kaydet (Commit) 7594c0c2 authored tarafından Michael Stahl's avatar Michael Stahl

canvas: DIRECTX_VERSION macro is obsolete

It was only checked by our own code, and only DirectX 9 is supported.

Change-Id: I03035f87969301624df011cb4d76c6a9532f3c99
üst 55b68ad0
...@@ -25,7 +25,6 @@ $(eval $(call gb_Library_use_sdk_api,directx9canvas)) ...@@ -25,7 +25,6 @@ $(eval $(call gb_Library_use_sdk_api,directx9canvas))
# clear NOMINMAX because GdiplusTypes.h uses those macros :( # clear NOMINMAX because GdiplusTypes.h uses those macros :(
$(eval $(call gb_Library_add_defs,directx9canvas,\ $(eval $(call gb_Library_add_defs,directx9canvas,\
-DDIRECTX_VERSION=0x0900 \
-UNOMINMAX \ -UNOMINMAX \
)) ))
......
...@@ -27,7 +27,6 @@ $(eval $(call gb_Library_use_sdk_api,gdipluscanvas)) ...@@ -27,7 +27,6 @@ $(eval $(call gb_Library_use_sdk_api,gdipluscanvas))
# clear NOMINMAX because GdiplusTypes.h uses those macros :( # clear NOMINMAX because GdiplusTypes.h uses those macros :(
$(eval $(call gb_Library_add_defs,gdipluscanvas,\ $(eval $(call gb_Library_add_defs,gdipluscanvas,\
-DDIRECTX_VERSION=0x0900 \
-UNOMINMAX \ -UNOMINMAX \
)) ))
......
...@@ -19,7 +19,6 @@ $(eval $(call gb_StaticLibrary_use_api,directxcanvas,\ ...@@ -19,7 +19,6 @@ $(eval $(call gb_StaticLibrary_use_api,directxcanvas,\
# clear NOMINMAX because GdiplusTypes.h uses those macros :( # clear NOMINMAX because GdiplusTypes.h uses those macros :(
$(eval $(call gb_StaticLibrary_add_defs,directxcanvas,\ $(eval $(call gb_StaticLibrary_add_defs,directxcanvas,\
-DDIRECTX_VERSION=0x0900 \
-UNOMINMAX \ -UNOMINMAX \
)) ))
......
...@@ -18,8 +18,6 @@ ...@@ -18,8 +18,6 @@
*/ */
#if DIRECTX_VERSION == 0x0900
#define MAX_TEXTURE_SIZE (2048) #define MAX_TEXTURE_SIZE (2048)
#define MIN_TEXTURE_SIZE (32) #define MIN_TEXTURE_SIZE (32)
//#define FAKE_MAX_NUMBER_TEXTURES (2) //#define FAKE_MAX_NUMBER_TEXTURES (2)
...@@ -1342,6 +1340,4 @@ namespace dxcanvas ...@@ -1342,6 +1340,4 @@ namespace dxcanvas
} }
} }
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -38,10 +38,6 @@ ...@@ -38,10 +38,6 @@
# define D3D_DEBUG_INFO # define D3D_DEBUG_INFO
#endif #endif
#ifndef DIRECTX_VERSION
#error please define for which directx version we should compile
#endif
#if defined _MSC_VER #if defined _MSC_VER
#pragma warning(push,1) #pragma warning(push,1)
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment