From aa066bdd4622d4f6824fee864f6be6806813f04d Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Fri, 30 Oct 2015 07:37:41 +0100 Subject: move to subdirectory-based build system Closes #224 --- opentrack/CMakeLists.txt | 10 ++++++++++ opentrack/mappings.hpp | 2 +- opentrack/tracker.h | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 opentrack/CMakeLists.txt (limited to 'opentrack') diff --git a/opentrack/CMakeLists.txt b/opentrack/CMakeLists.txt new file mode 100644 index 00000000..4581f394 --- /dev/null +++ b/opentrack/CMakeLists.txt @@ -0,0 +1,10 @@ +opentrack_boilerplate(opentrack-api NO-LIBRARY) +opentrack_qt(opentrack-api) +add_library(opentrack-api STATIC ${opentrack-api-all}) +opentrack_compat(opentrack-api) +target_link_libraries(opentrack-api ${MY_QT_LIBS}) +if(NOT WIN32) + target_link_libraries(opentrack-api dl) +else() + target_link_libraries(opentrack-api winmm) +endif() diff --git a/opentrack/mappings.hpp b/opentrack/mappings.hpp index 2391efd1..bb38a3ca 100644 --- a/opentrack/mappings.hpp +++ b/opentrack/mappings.hpp @@ -10,7 +10,7 @@ #include #include "options.hpp" using namespace options; -#include "qfunctionconfigurator/functionconfig.h" +#include "spline-widget/functionconfig.h" #include "main-settings.hpp" class Mapping { diff --git a/opentrack/tracker.h b/opentrack/tracker.h index b0e89455..890660e1 100644 --- a/opentrack/tracker.h +++ b/opentrack/tracker.h @@ -16,7 +16,7 @@ #include "simple-mat.hpp" #include "selected-libraries.hpp" -#include "qfunctionconfigurator/functionconfig.h" +#include "spline-widget/functionconfig.h" #include "main-settings.hpp" #include "options.hpp" -- cgit v1.2.3