X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=CMakeLists.txt;h=79dd8f8b3118e424e8279cd9498f9089ba4230e9;hb=ef2986c0f3e0ce3346a28d86348d8cc1746e9b66;hp=546b99dcfe98b615a44594ebcf351de396effe46;hpb=819e2e95555b2b3c2190f24a3cfa82250d1f34e5;p=pulseview.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 546b99d..79dd8f8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,7 +65,7 @@ endif()
 #= Dependencies
 #-------------------------------------------------------------------------------
 
-list(APPEND PKGDEPS libsigrokxx>=0.3.0)
+list(APPEND PKGDEPS libsigrokcxx>=0.3.0)
 
 if(ENABLE_DECODE)
 	list(APPEND PKGDEPS libsigrokdecode>=0.3.0)
@@ -146,6 +146,9 @@ set(pulseview_SOURCES
 	pv/session.cpp
 	pv/storesession.cpp
 	pv/util.cpp
+	pv/binding/binding.cpp
+	pv/binding/inputoutput.cpp
+	pv/binding/device.cpp
 	pv/data/analog.cpp
 	pv/data/analogsegment.cpp
 	pv/data/logic.cpp
@@ -154,6 +157,7 @@ set(pulseview_SOURCES
 	pv/data/segment.cpp
 	pv/dialogs/about.cpp
 	pv/dialogs/connect.cpp
+	pv/dialogs/inputoutputoptions.cpp
 	pv/dialogs/storeprogress.cpp
 	pv/popups/deviceoptions.cpp
 	pv/popups/channels.cpp
@@ -163,9 +167,7 @@ set(pulseview_SOURCES
 	pv/prop/int.cpp
 	pv/prop/property.cpp
 	pv/prop/string.cpp
-	pv/prop/binding/binding.cpp
-	pv/prop/binding/deviceoptions.cpp
-	pv/toolbars/samplingbar.cpp
+	pv/toolbars/mainbar.cpp
 	pv/view/analogsignal.cpp
 	pv/view/cursor.cpp
 	pv/view/cursorpair.cpp
@@ -186,8 +188,12 @@ set(pulseview_SOURCES
 	pv/view/viewitem.cpp
 	pv/view/viewitempaintparams.cpp
 	pv/view/viewport.cpp
+	pv/view/viewwidget.cpp
 	pv/widgets/colourbutton.cpp
 	pv/widgets/colourpopup.cpp
+	pv/widgets/devicetoolbutton.cpp
+	pv/widgets/exportmenu.cpp
+	pv/widgets/hidingmenubar.cpp
 	pv/widgets/popup.cpp
 	pv/widgets/popuptoolbutton.cpp
 	pv/widgets/sweeptimingwidget.cpp
@@ -199,8 +205,10 @@ set(pulseview_HEADERS
 	pv/mainwindow.hpp
 	pv/session.hpp
 	pv/storesession.hpp
+	pv/binding/device.hpp
 	pv/dialogs/about.hpp
 	pv/dialogs/connect.hpp
+	pv/dialogs/inputoutputoptions.hpp
 	pv/dialogs/storeprogress.hpp
 	pv/popups/channels.hpp
 	pv/popups/deviceoptions.hpp
@@ -210,8 +218,7 @@ set(pulseview_HEADERS
 	pv/prop/int.hpp
 	pv/prop/property.hpp
 	pv/prop/string.hpp
-	pv/prop/binding/deviceoptions.hpp
-	pv/toolbars/samplingbar.hpp
+	pv/toolbars/mainbar.hpp
 	pv/view/cursor.hpp
 	pv/view/flag.hpp
 	pv/view/header.hpp
@@ -227,8 +234,12 @@ set(pulseview_HEADERS
 	pv/view/view.hpp
 	pv/view/viewitem.hpp
 	pv/view/viewport.hpp
+	pv/view/viewwidget.hpp
 	pv/widgets/colourbutton.hpp
 	pv/widgets/colourpopup.hpp
+	pv/widgets/devicetoolbutton.hpp
+	pv/widgets/exportmenu.hpp
+	pv/widgets/hidingmenubar.hpp
 	pv/widgets/popup.hpp
 	pv/widgets/popuptoolbutton.hpp
 	pv/widgets/sweeptimingwidget.hpp
@@ -250,12 +261,12 @@ endif()
 
 if(ENABLE_DECODE)
 	list(APPEND pulseview_SOURCES
+		pv/binding/decoder.cpp
 		pv/data/decoderstack.cpp
 		pv/data/decode/annotation.cpp
 		pv/data/decode/decoder.cpp
 		pv/data/decode/row.cpp
 		pv/data/decode/rowdata.cpp
-		pv/prop/binding/decoderoptions.cpp
 		pv/view/decodetrace.cpp
 		pv/widgets/decodergroupbox.cpp
 		pv/widgets/decodermenu.cpp