From: José Fonseca <jose.r.fonseca@gmail.com>
Date: Wed, 25 May 2011 20:03:40 +0000 (+0100)
Subject: Build fixes.
X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=784c01018252a14b333bda9b497404262a63fcd3;p=apitrace

Build fixes.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 57361b6..2bb87ff 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -178,8 +178,8 @@ if (WIN32)
     endif (DirectX_D3D_INCLUDE_DIR)
 
     # d3d8.dll
-    if (DirectX_D3D8_INCLUDE_DIR)
-        include_directories (${DirectX_D3D8_INCLUDE_DIR})
+    if (DirectX_D3D8_INCLUDE_DIR AND DirectX_D3DX9_INCLUDE_DIR)
+        include_directories (${DirectX_D3D8_INCLUDE_DIR} ${DirectX_D3DX9_INCLUDE_DIR})
         add_custom_command (
             OUTPUT d3d8.cpp
             COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d8.py > ${CMAKE_CURRENT_BINARY_DIR}/d3d8.cpp
@@ -192,7 +192,7 @@ if (WIN32)
             LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers
         )
         install (TARGETS d3d8 RUNTIME DESTINATION wrappers)
-    endif (DirectX_D3D8_INCLUDE_DIR)
+    endif (DirectX_D3D8_INCLUDE_DIR AND DirectX_D3DX9_INCLUDE_DIR)
 
     # d3d9.dll
     if (DirectX_D3DX9_INCLUDE_DIR)
diff --git a/d3d.py b/d3d.py
index dbda94c..9deed97 100644
--- a/d3d.py
+++ b/d3d.py
@@ -229,8 +229,7 @@ IDirect3DDevice.methods += [
     Method(HRESULT, "GetPickRecords", [LPDWORD,LPD3DPICKRECORD]),
     Method(HRESULT, "EnumTextureFormats", [LPD3DENUMTEXTUREFORMATSCALLBACK,LPVOID]),
     Method(HRESULT, "CreateMatrix", [LPD3DMATRIXHANDLE]),
-    #Method(HRESULT, "SetMatrix", [D3DMATRIXHANDLE,Const(LPD3DMATRIX)]),
-    Method(HRESULT, "SetMatrix", [D3DMATRIXHANDLE,LPD3DMATRIX]),
+    Method(HRESULT, "SetMatrix", [D3DMATRIXHANDLE,Const(LPD3DMATRIX)]),
     Method(HRESULT, "GetMatrix", [D3DMATRIXHANDLE,LPD3DMATRIX]),
     Method(HRESULT, "DeleteMatrix", [D3DMATRIXHANDLE]),
     Method(HRESULT, "BeginScene", []),
diff --git a/d3dtypes.py b/d3dtypes.py
index 3ac19a5..c80da76 100644
--- a/d3dtypes.py
+++ b/d3dtypes.py
@@ -122,7 +122,7 @@ D3DMATRIX = Struct("D3DMATRIX", [
          41, 42, 43, 44
     ]
 ])
-LPD3DMATRIX = Pointer(D3DMATRIX)
+LPD3DMATRIX = Alias("LPD3DMATRIX", Pointer(D3DMATRIX))
 
 D3DVIEWPORT = Struct("D3DVIEWPORT", [
     (DWORD, "dwSize"),