summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2014-11-02 07:03:22 +0100
committerStanislaw Halik <sthalik@misaki.pl>2014-11-02 07:03:22 +0100
commitb7f128745f7a5a506ec2786bdb2645f4d0ec7c86 (patch)
tree7744d97061441fedd6fa2c2b0ea2aaf2c54ba998
parent5d138e3d61c7400e678e8f62eacaa04168e40f31 (diff)
rename pose widget subdir
-rw-r--r--CMakeLists.txt5
-rw-r--r--pose-widget/glwidget.cpp (renamed from ftnoir_posewidget/glwidget.cpp)0
-rw-r--r--pose-widget/glwidget.h (renamed from ftnoir_posewidget/glwidget.h)0
-rw-r--r--pose-widget/images/side1.png (renamed from ftnoir_posewidget/images/side1.png)bin26449 -> 26449 bytes
-rw-r--r--pose-widget/images/side6.png (renamed from ftnoir_posewidget/images/side6.png)bin26493 -> 26493 bytes
-rw-r--r--pose-widget/posewidget.qrc (renamed from ftnoir_posewidget/posewidget.qrc)0
6 files changed, 3 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 162b6ba4..8f2ed953 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -228,9 +228,10 @@ opentrack_module(opentrack-csv ftnoir_csv)
add_library(opentrack-csv STATIC ${opentrack-csv-c})
target_link_libraries(opentrack-csv ${MY_QT_LIBS})
-opentrack_module(opentrack-pose-widget ftnoir_posewidget)
-include_directories(ftnoir_posewidget/)
+opentrack_module(opentrack-pose-widget pose-widget)
+include_directories(pose-widget/) # else Qt moc breaks
opentrack_qt(opentrack-pose-widget)
+
add_library(opentrack-pose-widget STATIC ${opentrack-pose-widget-all})
target_link_libraries(opentrack-pose-widget ${MY_QT_LIBS})
diff --git a/ftnoir_posewidget/glwidget.cpp b/pose-widget/glwidget.cpp
index 07445c8a..07445c8a 100644
--- a/ftnoir_posewidget/glwidget.cpp
+++ b/pose-widget/glwidget.cpp
diff --git a/ftnoir_posewidget/glwidget.h b/pose-widget/glwidget.h
index 43a0f853..43a0f853 100644
--- a/ftnoir_posewidget/glwidget.h
+++ b/pose-widget/glwidget.h
diff --git a/ftnoir_posewidget/images/side1.png b/pose-widget/images/side1.png
index d7467943..d7467943 100644
--- a/ftnoir_posewidget/images/side1.png
+++ b/pose-widget/images/side1.png
Binary files differ
diff --git a/ftnoir_posewidget/images/side6.png b/pose-widget/images/side6.png
index eaa80d7e..eaa80d7e 100644
--- a/ftnoir_posewidget/images/side6.png
+++ b/pose-widget/images/side6.png
Binary files differ
diff --git a/ftnoir_posewidget/posewidget.qrc b/pose-widget/posewidget.qrc
index e799432f..e799432f 100644
--- a/ftnoir_posewidget/posewidget.qrc
+++ b/pose-widget/posewidget.qrc