From: Hector Martin <hector@marcansoft.com>
Date: Sat, 12 Mar 2011 17:21:20 +0000 (+0100)
Subject: Move tracer into libol
X-Git-Url: https://gitweb.tyo.aptx.org/?a=commitdiff_plain;h=0ec24dfb8f4005904b99295a5a0036c5903ea6ba;p=openlase.git

Move tracer into libol
---

diff --git a/examples/27c3_slides/CMakeLists.txt b/examples/27c3_slides/CMakeLists.txt
index 4ea1626..636d60e 100644
--- 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 d2ae3e2..26ea2c1 100644
--- 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 c88cf76..991ed07 100644
--- 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)")