Merge branch 'glproc-cleanup'

diff --combined CMakeLists.txt
index 29df0cbfb932d7c1b97073706aad3459f9a96af6,7090a34a21c4fde86b63aae73b03abd84d23f11c..710c626ec7dbc465c626e137c2aac754038fc478
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -40,15 -40,14 +40,14 @@@ if (ENABLE_GUI
      find_package (QJSON ${REQUIRE_GUI})
  endif ()
  
+ include_directories (${OPENGL_INCLUDE_DIR})
+ 
  if (WIN32)
      find_package (DirectX)
  elseif (APPLE)
  else ()
      find_package (X11 REQUIRED)
  
-     set (X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
-     set (X11_GL_LIB ${OPENGL_gl_LIBRARY})
- 
      include_directories (${X11_INCLUDE_DIR})
  
      if (ENABLE_EGL)
@@@ -269,7 -268,6 +268,7 @@@ add_library (common STATI
      common/trace_file_snappy.cpp
      common/trace_model.cpp
      common/trace_parser.cpp
 +    common/trace_parser_flags.cpp
      common/trace_writer.cpp
      common/trace_writer_local.cpp
      common/trace_writer_model.cpp
@@@ -378,6 -376,7 +377,7 @@@ if (WIN32
      add_library (wgltrace MODULE specs/opengl32.def
          wgltrace.cpp
          glcaps.cpp
+         glproc_gl.cpp
          ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp
      )
      set_target_properties (wgltrace PROPERTIES
@@@ -399,6 -398,7 +399,7 @@@ elseif (APPLE
      add_library (cgltrace SHARED
          cgltrace.cpp
          glcaps.cpp
+         glproc_gl.cpp
          ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp
      )
  
@@@ -426,6 -426,7 +427,7 @@@ else (
          ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp
          glxtrace.cpp
          glcaps.cpp
+         glproc_gl.cpp
      )
  
      set_target_properties (glxtrace PROPERTIES
@@@ -456,6 -457,7 +458,7 @@@ if (EGL_FOUND
          ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp
          egltrace.cpp
          glcaps.cpp
+         glproc_egl.cpp
      )
  
      set_property (
@@@ -517,6 -519,7 +520,7 @@@ set (retrace_source
  add_executable (glretrace
      ${retrace_sources}
      ${glws_os}
+     glproc_gl.cpp
  )
  
  set_property (
@@@ -530,7 -533,6 +534,6 @@@ target_link_libraries (glretrac
  )
  
  if (WIN32)
-     target_link_libraries (glretrace ${OPENGL_gl_LIBRARY})
  elseif (APPLE)
      target_link_libraries (glretrace
          "-framework Cocoa"
@@@ -538,7 -540,7 +541,7 @@@
          ${OPENGL_gl_LIBRARY} # CGL*
      )
  else ()
-     target_link_libraries (glretrace ${OPENGL_gl_LIBRARY} ${X11_X11_LIB})
+     target_link_libraries (glretrace ${X11_X11_LIB})
  endif ()
  
  install (TARGETS glretrace RUNTIME DESTINATION bin) 
@@@ -547,6 -549,7 +550,7 @@@ if (EGL_FOUND AND NOT WIN32 AND NOT APP
      add_executable (eglretrace
          ${retrace_sources}
          glws_egl_xlib.cpp
+         glproc_egl.cpp
      )
  
      set_property (
@@@ -561,8 -564,6 +565,6 @@@
      )
  
      target_link_libraries (eglretrace
-         ${EGL_LIBRARIES}
-         ${OPENGL_gl_LIBRARY}
          ${X11_X11_LIB}
      )