Move tracer into libol

diff --git a/examples/27c3_slides/CMakeLists.txt b/examples/27c3_slides/CMakeLists.txt
index 4ea1626ce7f4124dbc737ff58f204005ab2125b9..636d60e6e9fd2ca096778e7c0d970132e3f34054 100644 (file)
--- a/examples/27c3_slides/CMakeLists.txt
+++ b/examples/27c3_slides/CMakeLists.txt
@@ -21,7 +21,6 @@ if(CURSES_FOUND AND FFMPEG_FOUND)
 
   add_executable(slides
     main.c 3ddemos.c static.c metaballs.c circlescope.c avstream.c video.c pong.c
-    ${CMAKE_SOURCE_DIR}/tools/trace.c
 
     ${CMAKE_CURRENT_BINARY_DIR}/openlase-logo.ild
     ${CMAKE_CURRENT_BINARY_DIR}/27c3-logo.ild

diff --git a/tools/trace.h b/include/trace.h
similarity index 100%
rename from tools/trace.h
rename to include/trace.h

diff --git a/libol/CMakeLists.txt b/libol/CMakeLists.txt
index d2ae3e2f0e0b401d40dabb672a16d1007ffa5493..26ea2c1c16ce4ddd71d50ad65c1247f711535951 100644 (file)
--- a/libol/CMakeLists.txt
+++ b/libol/CMakeLists.txt
@@ -18,7 +18,7 @@
 
 include_directories (${CMAKE_SOURCE_DIR}/include)
 
-add_library (openlase SHARED libol.c text.c ilda.c ${CMAKE_CURRENT_BINARY_DIR}/fontdef.c)
+add_library (openlase SHARED libol.c text.c ilda.c trace.c ${CMAKE_CURRENT_BINARY_DIR}/fontdef.c)
 target_link_libraries (openlase ${CMAKE_THREAD_LIBS_INIT} m jack)
 
 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/fontdef.c

diff --git a/tools/trace.c b/libol/trace.c
similarity index 100%
rename from tools/trace.c
rename to libol/trace.c

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index c88cf76e83203446102a7b358e14a11d64e68928..991ed07b70790f244c558833efd1e72a7c3ac714 100644 (file)
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -23,7 +23,7 @@ add_executable(playilda playilda.c)
 target_link_libraries(playilda ${JACK_LIBRARIES})
 
 if(FFMPEG_FOUND)
-  add_executable(playvid playvid.c trace.c)
+  add_executable(playvid playvid.c)
   target_link_libraries(playvid openlase ${FFMPEG_LIBRARIES})
 else()
   message(STATUS "Will NOT build playvid (FFmpeg missing)")