diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2015-10-30 07:37:41 +0100 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-10-30 08:39:32 +0100 |
commit | aa066bdd4622d4f6824fee864f6be6806813f04d (patch) | |
tree | 3df328b8b364cba2373a85827191b259bd78d546 /opentrack | |
parent | d6a54431d178632a2bf466c9904f74abd143afe6 (diff) |
move to subdirectory-based build system
Closes #224
Diffstat (limited to 'opentrack')
-rw-r--r-- | opentrack/CMakeLists.txt | 10 | ||||
-rw-r--r-- | opentrack/mappings.hpp | 2 | ||||
-rw-r--r-- | opentrack/tracker.h | 2 |
3 files changed, 12 insertions, 2 deletions
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 <QSettings> #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" |