Merge branch 'master' into d3d10

Conflicts:
	CMakeLists.txt

diff --cc CMakeLists.txt
index 82a4a31377e410a5e7f8600744ec98c21c3dc3d1,32f1498342d91932016c41d0c2b8a65c8c46dbc1..c9b740ccac465767ad1aeaded0b200a8e29ea0cf
--- 1/CMakeLists.txt
--- 2/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 (