make the direct3d engine working with d3dx9 header files

from Microsoft SDK (november 2008)

Patch by Roberto Huelga (modified + minor improvements)

git-svn-id: http://svn.enlightenment.org/svn/e/trunk/evas@38850 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/modules/engines/direct3d/Evas_Engine_Direct3D.h b/src/modules/engines/direct3d/Evas_Engine_Direct3D.h
index 001a782..05359a3 100644 (file)
--- a/src/modules/engines/direct3d/Evas_Engine_Direct3D.h
+++ b/src/modules/engines/direct3d/Evas_Engine_Direct3D.h
@@ -2,7 +2,9 @@
 #define __EVAS_ENGINE_DIRECT3D_H__
 
 
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
+#undef WIN32_LEAN_AND_MEAN
 
 typedef struct _Evas_Engine_Info_Direct3D Evas_Engine_Info_Direct3D;
 

diff --git a/src/modules/engines/direct3d/evas_direct3d_main.cpp b/src/modules/engines/direct3d/evas_direct3d_main.cpp
index b1074b9..4af8448 100644 (file)
--- a/src/modules/engines/direct3d/evas_direct3d_main.cpp
+++ b/src/modules/engines/direct3d/evas_direct3d_main.cpp
@@ -4,6 +4,8 @@
 #include "evas_engine.h"
 #include <assert.h>
 
+#include <d3dx9.h>
+
 #include "evas_direct3d_device.h"
 #include "evas_direct3d_context.h"
 #include "evas_direct3d_shader_pack.h"

diff --git a/src/modules/engines/direct3d/evas_direct3d_object_image.cpp b/src/modules/engines/direct3d/evas_direct3d_object_image.cpp
index a989aaa..3bf2f38 100644 (file)
--- a/src/modules/engines/direct3d/evas_direct3d_object_image.cpp
+++ b/src/modules/engines/direct3d/evas_direct3d_object_image.cpp
@@ -2,6 +2,8 @@
 
 #include <string.h>
 
+#include <d3dx9.h>
+
 #include "evas_direct3d_object_image.h"
 #include "evas_direct3d_image_cache.h"
 #include "evas_direct3d_device.h"

diff --git a/src/modules/engines/direct3d/evas_direct3d_shader_pack.cpp b/src/modules/engines/direct3d/evas_direct3d_shader_pack.cpp
index c646141..6d7a789 100644 (file)
--- a/src/modules/engines/direct3d/evas_direct3d_shader_pack.cpp
+++ b/src/modules/engines/direct3d/evas_direct3d_shader_pack.cpp
@@ -1,6 +1,10 @@
+
+#include <assert.h>
+
+#include <d3dx9.h>
+
 #include "evas_direct3d_shader_pack.h"
 #include "evas_direct3d_device.h"
-#include <assert.h>
 
 Ref<D3DShaderPack> D3DShaderPack::_this;
 

diff --git a/src/modules/engines/direct3d/evas_engine.h b/src/modules/engines/direct3d/evas_engine.h
index a5170a3..84c0431 100644 (file)
--- a/src/modules/engines/direct3d/evas_engine.h
+++ b/src/modules/engines/direct3d/evas_engine.h
@@ -2,9 +2,10 @@
 #define __EVAS_ENGINE_H__
 
 
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
+#undef WIN32_LEAN_AND_MEAN
 #include <d3d9.h>
-#include <d3dx9.h>
 
 #ifdef __cplusplus
 extern "C" {