Merge branch 'master' into d3d10

Conflicts:
	CMakeLists.txt

diff --combined CMakeLists.txt
index 82a4a31377e410a5e7f8600744ec98c21c3dc3d1,32f1498342d91932016c41d0c2b8a65c8c46dbc1..c9b740ccac465767ad1aeaded0b200a8e29ea0cf
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -163,7 -163,10 +163,10 @@@ include_directories (${CMAKE_CURRENT_SO
  ##############################################################################
  # Common libraries / utilities
  
- include_directories (${CMAKE_CURRENT_SOURCE_DIR})
+ include_directories (
+     ${CMAKE_CURRENT_SOURCE_DIR}
+     ${CMAKE_CURRENT_SOURCE_DIR}/common
+ )
  
  add_custom_command (
      OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp
@@@ -180,18 -183,19 +183,19 @@@ else (WIN32
  endif (WIN32)
  
  add_library (common
-     trace_file.cpp
-     trace_snappyfile.cpp
-     trace_model.cpp
-     trace_parser.cpp
-     trace_writer.cpp
-     trace_local_writer.cpp
-     trace_model_writer.cpp
-     image.cpp
-     image_bmp.cpp
-     image_pnm.cpp
-     image_png.cpp
-     ${os}
+     common/trace_file.cpp
+     common/trace_snappyfile.cpp
+     common/trace_model.cpp
+     common/trace_parser.cpp
+     common/trace_writer.cpp
+     common/trace_local_writer.cpp
+     common/trace_model_writer.cpp
+     common/trace_loader.cpp
+     common/image.cpp
+     common/image_bmp.cpp
+     common/image_pnm.cpp
+     common/image_png.cpp
+     common/${os}
  )
  
  set_target_properties (common PROPERTIES
@@@ -213,11 -217,11 +217,11 @@@ if (WIN32
      if (DirectX_D3D_INCLUDE_DIR)
          include_directories (SYSTEM ${DirectX_D3D_INCLUDE_DIR})
          add_custom_command (
-             OUTPUT ddraw.cpp
-             COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d.py > ${CMAKE_CURRENT_BINARY_DIR}/ddraw.cpp
-             DEPENDS d3d.py d3dtypes.py d3dcaps.py ddraw.py trace.py winapi.py stdapi.py
+             OUTPUT ddrawtrace.cpp
+             COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/ddrawtrace.py > ${CMAKE_CURRENT_BINARY_DIR}/ddrawtrace.cpp
+             DEPENDS ddrawtrace.py d3d.py d3dtypes.py d3dcaps.py ddraw.py trace.py winapi.py stdapi.py
          )
-         add_library (ddraw MODULE ddraw.def ddraw.cpp)
+         add_library (ddraw MODULE ddraw.def ddrawtrace.cpp)
          set_target_properties (ddraw
              PROPERTIES PREFIX ""
              RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers
@@@ -230,11 -234,11 +234,11 @@@
      if (DirectX_D3D8_INCLUDE_DIR AND DirectX_D3DX9_INCLUDE_DIR)
          include_directories (SYSTEM ${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
-             DEPENDS d3d8.py trace.py d3d8types.py d3d8caps.py winapi.py stdapi.py
+             OUTPUT d3d8trace.cpp
+             COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d8trace.py > ${CMAKE_CURRENT_BINARY_DIR}/d3d8trace.cpp
+             DEPENDS d3d8trace.py d3d8.py trace.py d3d8types.py d3d8caps.py winapi.py stdapi.py
          )
-         add_library (d3d8 MODULE d3d8.def d3d8.cpp d3dshader.cpp)
+         add_library (d3d8 MODULE d3d8.def d3d8trace.cpp d3dshader.cpp)
          set_target_properties (d3d8
              PROPERTIES PREFIX ""
              RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers
@@@ -247,11 -251,11 +251,11 @@@
      if (DirectX_D3DX9_INCLUDE_DIR)
          include_directories (SYSTEM ${DirectX_D3DX9_INCLUDE_DIR})
          add_custom_command (
-             OUTPUT d3d9.cpp
-             COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d9.py > ${CMAKE_CURRENT_BINARY_DIR}/d3d9.cpp
-             DEPENDS d3d9.py trace.py d3d9types.py d3d9caps.py winapi.py stdapi.py
+             OUTPUT d3d9trace.cpp
+             COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d9trace.py > ${CMAKE_CURRENT_BINARY_DIR}/d3d9trace.cpp
+             DEPENDS d3d9trace.py d3d9.py trace.py d3d9types.py d3d9caps.py winapi.py stdapi.py
          )
-         add_library (d3d9 MODULE d3d9.def d3d9.cpp d3dshader.cpp)
+         add_library (d3d9 MODULE d3d9.def d3d9trace.cpp d3dshader.cpp)
          set_target_properties (d3d9
              PROPERTIES PREFIX ""
              RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/wrappers
@@@ -261,17 -265,17 +265,17 @@@
      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 (
@@@ -383,7 -387,6 +387,6 @@@ add_executable (glretrac
      glstate_params.cpp
      retrace.cpp
      ${glws}
-     image.cpp 
      ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp
  )
  
@@@ -425,7 -428,14 +428,14 @@@ endif (
  ##############################################################################
  # Packaging
  
- install (FILES LICENSE README.markdown TODO.markdown DESTINATION doc)
+ install (
+     FILES
+         BUGS.markdown
+         LICENSE
+         NEWS.markdown
+         README.markdown
+         TODO.markdown
+     DESTINATION doc)
  
  set (CPACK_PACKAGE_VERSION_MAJOR "1")
  set (CPACK_PACKAGE_VERSION_MINOR "0")