From: José Fonseca <jose.r.fonseca@gmail.com>
Date: Fri, 23 Sep 2011 07:33:13 +0000 (+0100)
Subject: Merge branch 'master' into d3d10
X-Git-Url: https://git.cworth.org/git?p=apitrace;a=commitdiff_plain;h=ae2b4d32ed56e3ac193cc7205aeb58082c448ce8

Merge branch 'master' into d3d10

Conflicts:
	CMakeLists.txt
---

ae2b4d32ed56e3ac193cc7205aeb58082c448ce8
diff --cc CMakeLists.txt
index 82a4a31,32f1498..c9b740c
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -261,17 -265,17 +265,17 @@@ if (WIN32
      endif (DirectX_D3DX9_INCLUDE_DIR)
  
      # d3d10.dll
 -    #if (DirectX_D3D10_INCLUDE_DIR)
 -    #    include_directories (SYSTEM ${DirectX_D3D10_INCLUDE_DIR})
 -    #    add_custom_command (
 -    #        OUTPUT d3d10.cpp
 -    #        COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d10misc.py > ${CMAKE_CURRENT_BINARY_DIR}/d3d10trace.cpp
 -    #        DEPENDS d3d10misc.py winapi.py stdapi.py
 -    #    )
 -    #    add_library (d3d10 MODULE d3d10.def d3d10trace.cpp)
 -    #    set_target_properties (d3d10 PROPERTIES PREFIX "")
 -    #    install (TARGETS d3d10 LIBRARY DESTINATION wrappers)
 -    #endif (DirectX_D3D10_INCLUDE_DIR)
 +    if (DirectX_D3D10_INCLUDE_DIR)
 +        include_directories (SYSTEM ${DirectX_D3D10_INCLUDE_DIR})
 +        add_custom_command (
-             OUTPUT d3d10.cpp
-             COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d10misc.py > ${CMAKE_CURRENT_BINARY_DIR}/d3d10.cpp
++            OUTPUT d3d10trace.cpp
++            COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d10misc.py > ${CMAKE_CURRENT_BINARY_DIR}/d3d10trace.cpp
 +            DEPENDS d3d10misc.py d3d10.py winapi.py stdapi.py
 +        )
-         add_library (d3d10 MODULE d3d10.def d3d10.cpp)
++        add_library (d3d10 MODULE d3d10.def d3d10trace.cpp)
 +        set_target_properties (d3d10 PROPERTIES PREFIX "")
 +        install (TARGETS d3d10 LIBRARY DESTINATION wrappers)
 +    endif (DirectX_D3D10_INCLUDE_DIR)
  
      # opengl32.dll
      add_custom_command (