Merge commit '5c298db8fe117e0a445af051335aa0da91c3a31b'

diff --combined wrappers/CMakeLists.txt
index 259c7fb4759d03887ab23457d3f3227ead5d23f1,b9e3eefe88314146f5dfc9e6f219c36677d954df..17aff4c6e3a2e3e81b7dda4d4ba5e32761bab73e
--- 1/wrappers/CMakeLists.txt
--- 2/wrappers/CMakeLists.txt
+++ b/wrappers/CMakeLists.txt
@@@ -9,14 -9,6 +9,14 @@@ include_directories 
      ${CMAKE_SOURCE_DIR}/dispatch
  )
  
 +add_library (common_trace STATIC
 +    trace.cpp
 +)
 +
 +set_target_properties (common_trace PROPERTIES
 +    # Ensure it can be statically linked in shared libraries
 +    COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_CXX_FLAGS}"
 +)
  
  if (WIN32)
      if (MINGW)
@@@ -44,7 -36,6 +44,7 @@@
          )
          add_library (ddrawtrace MODULE ddraw.def ddrawtrace.cpp)
          target_link_libraries (ddrawtrace
 +            common_trace
              common
              ${ZLIB_LIBRARIES}
              ${SNAPPY_LIBRARIES}
@@@ -75,7 -66,6 +75,7 @@@
          )
          add_library (d3d8trace MODULE d3d8.def d3d8trace.cpp d3d9shader.cpp)
          target_link_libraries (d3d8trace
 +            common_trace
              common
              ${ZLIB_LIBRARIES}
              ${SNAPPY_LIBRARIES}
@@@ -106,7 -96,6 +106,7 @@@
          )
          add_library (d3d9trace MODULE d3d9.def d3d9trace.cpp d3d9shader.cpp)
          target_link_libraries (d3d9trace
 +            common_trace
              common
              ${ZLIB_LIBRARIES}
              ${SNAPPY_LIBRARIES}
@@@ -143,7 -132,6 +143,7 @@@
          )
          add_library (d3d10trace MODULE d3d10.def d3d10trace.cpp d3d10shader.cpp)
          target_link_libraries (d3d10trace
 +            common_trace
              common
              ${ZLIB_LIBRARIES}
              ${SNAPPY_LIBRARIES}
@@@ -178,7 -166,6 +178,7 @@@
          )
          add_library (d3d10_1trace MODULE d3d10_1.def d3d10_1trace.cpp)
          target_link_libraries (d3d10_1trace
 +            common_trace
              common
              ${ZLIB_LIBRARIES}
              ${SNAPPY_LIBRARIES}
@@@ -218,7 -205,6 +218,7 @@@
          )
          add_library (d3d11trace MODULE d3d11.def d3d11trace.cpp)
          target_link_libraries (d3d11trace
 +            common_trace
              common
              ${ZLIB_LIBRARIES}
              ${SNAPPY_LIBRARIES}
@@@ -250,11 -236,11 +250,12 @@@
      add_library (wgltrace MODULE opengl32.def
          wgltrace.cpp
          glcaps.cpp
+         gltrace_state.cpp
      )
      add_dependencies (wgltrace glproc)
      target_link_libraries (wgltrace
          glproc_gl
 +        common_trace
          common
          ${ZLIB_LIBRARIES}
          ${SNAPPY_LIBRARIES}
@@@ -284,6 -270,7 +285,7 @@@ elseif (APPLE
      add_library (cgltrace SHARED
          cgltrace.cpp
          glcaps.cpp
+         gltrace_state.cpp
      )
  
      add_dependencies (cgltrace glproc)
@@@ -297,7 -284,6 +299,7 @@@
  
      target_link_libraries (cgltrace
          glproc_gl
 +        common_trace
          common
          ${ZLIB_LIBRARIES}
          ${SNAPPY_LIBRARIES}
@@@ -325,6 -311,7 +327,7 @@@ elseif (X11_FOUND
      add_library (glxtrace SHARED
          glxtrace.cpp
          glcaps.cpp
+         gltrace_state.cpp
      )
  
      add_dependencies (glxtrace glproc)
@@@ -339,7 -326,6 +342,7 @@@
  
      target_link_libraries (glxtrace
          glproc_gl
 +        common_trace
          common
          ${ZLIB_LIBRARIES}
          ${SNAPPY_LIBRARIES}
@@@ -372,6 -358,7 +375,7 @@@ if (ENABLE_EGL AND NOT WIN32 AND NOT AP
      add_library (egltrace SHARED
          egltrace.cpp
          glcaps.cpp
+         gltrace_state.cpp
      )
  
      add_dependencies (egltrace glproc)
@@@ -386,7 -373,6 +390,7 @@@
  
      target_link_libraries (egltrace
          glproc_egl
 +        common_trace
          common
          ${ZLIB_LIBRARIES}
          ${SNAPPY_LIBRARIES}