X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=CMakeLists.txt;h=78a6f2d6b34650b9bf436ce5a216e9e02eb5d294;hb=8ebb10b1c15ec5999b9a828d3efb7eefb3494e46;hp=64c0f538c7628d1f60b1b729f7ed85cca58104f5;hpb=ddedb6bcc0fee9571861aecbf4574f549761f763;p=apitrace

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 64c0f53..78a6f2d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,14 +20,6 @@ find_package (DirectX)
 
 find_package (GLUT)
 
-find_library (GLEW_glew_LIBRARY GLEW
-	/usr/lib
-)
-
-find_path (GLEW_INCLUDE_DIR GL/glew.h
-      /usr/include/GL
-)
-
 if (WIN32)
 	# MSVC & MinGW only define & use APIENTRY
 	add_definitions (-DGLAPIENTRY=__stdcall)
@@ -57,6 +49,9 @@ if (MSVC)
 			string (REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
 		endif (${flag_var} MATCHES "/MD")
 	endforeach (flag_var)
+    
+    # C99 headers
+    include_directories (c99)
 else ()
 	# Adjust warnings
 	add_definitions (-Wall)
@@ -102,7 +97,7 @@ if (WIN32)
 	#		COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d8.py > ${CMAKE_CURRENT_BINARY_DIR}/d3d8.cpp
 	#		DEPENDS d3d8.py d3d8types.py d3d8caps.py winapi.py stdapi.py
 	#	)
-	#	add_library (d3d8 SHARED d3d8.def d3d8.cpp log.cpp os_win32.cpp)
+	#	add_library (d3d8 SHARED d3d8.def d3d8.cpp trace_write.cpp os_win32.cpp)
 	#	set_target_properties (d3d8 PROPERTIES PREFIX "")
 	#endif (DirectX_D3D8_FOUND)
 
@@ -114,7 +109,7 @@ if (WIN32)
 	#		COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d9.py > ${CMAKE_CURRENT_BINARY_DIR}/d3d9.cpp
 	#		DEPENDS d3d9.py d3d9types.py d3d9caps.py d3dshader.py winapi.py stdapi.py
 	#	)
-	#	add_library (d3d9 SHARED d3d9.def d3d9.cpp log.cpp os_win32.cpp)
+	#	add_library (d3d9 SHARED d3d9.def d3d9.cpp trace_write.cpp os_win32.cpp)
 	#	set_target_properties (d3d9 PROPERTIES PREFIX "")
 	#endif (DirectX_D3DX9_FOUND)
 
@@ -126,7 +121,7 @@ if (WIN32)
 	#		COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/d3d10misc.py > ${CMAKE_CURRENT_BINARY_DIR}/d3d10.cpp
 	#		DEPENDS d3d10misc.py winapi.py stdapi.py
 	#	)
-	#	add_library (d3d10 SHARED d3d10.def d3d10.cpp log.cpp os_win32.cpp)
+	#	add_library (d3d10 SHARED d3d10.def d3d10.cpp trace_write.cpp os_win32.cpp)
 	#	set_target_properties (d3d10 PROPERTIES PREFIX "")
 	#endif (DirectX_D3D10_FOUND)
 
@@ -134,9 +129,9 @@ if (WIN32)
 	add_custom_command (
 		OUTPUT opengl32.cpp
 		COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/wgltrace.py > ${CMAKE_CURRENT_BINARY_DIR}/opengl32.cpp
-		DEPENDS wgltrace.py trace.py wglapi.py glenum.py glapi.py glenum.py winapi.py stdapi.py
+		DEPENDS wgltrace.py trace.py wglapi.py glapi.py glenum.py winapi.py stdapi.py
 	)
-	add_library (opengl SHARED opengl32.def opengl32.cpp log.cpp os_win32.cpp)
+	add_library (opengl SHARED opengl32.def opengl32.cpp trace_write.cpp os_win32.cpp)
 	set_target_properties (opengl PROPERTIES
 		PREFIX ""
 		OUTPUT_NAME opengl32)
@@ -150,38 +145,48 @@ else ()
 	add_custom_command (
 		OUTPUT glxtrace.cpp
 		COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glxtrace.py > ${CMAKE_CURRENT_BINARY_DIR}/glxtrace.cpp
-		DEPENDS glxtrace.py trace.py glapi.py glenum.py stdapi.py
+		DEPENDS glxtrace.py trace.py glxapi.py glapi.py glenum.py stdapi.py
 	)
 
-	add_library (glxtrace SHARED glxtrace.cpp log.cpp os_posix.cpp)
+	add_library (glxtrace SHARED glxtrace.cpp trace_write.cpp os_posix.cpp)
 	set_target_properties (glxtrace PROPERTIES PREFIX "")
 	target_link_libraries (glxtrace dl)
 endif ()
 
 add_executable (dump dump.cpp trace_model.cpp)
 
+if (WIN32)
+    set (os os_win32.cpp)
+else (WIN32)
+    set (os os_posix.cpp)
+endif (WIN32)
+
+if (GLUT_INCLUDE_DIR)
+	add_custom_command (
+		OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp
+		COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glproc.py > ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp
+		DEPENDS glproc.py wglapi.py glxapi.py glapi.py glenum.py stdapi.py
+	)
 
-if (GLEW_INCLUDE_DIR)
 	add_custom_command (
 		OUTPUT glretrace.cpp
 		COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glretrace.py > ${CMAKE_CURRENT_BINARY_DIR}/glretrace.cpp
-		DEPENDS glretrace.py retrace.py glapi.py glenum.py stdapi.py
+		DEPENDS glretrace.py retrace.py codegen.py glapi.py glenum.py stdapi.py
 	)
 
 	include_directories (
+		${CMAKE_CURRENT_BINARY_DIR}
 		${OPENGL_INCLUDE_PATH}
 		${GLUT_INCLUDE_DIR}
-		${GLEW_INCLUDE_DIR}
 	)
 
-	add_executable (glretrace glretrace.cpp trace_model.cpp)
+	add_executable (glretrace glretrace.cpp trace_model.cpp ${os} ${CMAKE_CURRENT_BINARY_DIR}/glproc.hpp)
 
 	target_link_libraries (glretrace
 		${OPENGL_gl_LIBRARY}
 		${OPENGL_glu_LIBRARY}
 		${GLUT_glut_LIBRARY}
-		${GLEW_glew_LIBRARY}
 	)
-endif (GLEW_INCLUDE_DIR)
+endif (GLUT_INCLUDE_DIR)