X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=CMakeLists.txt;h=2fd35b1c3a1ee389fa1587ff2c2cafdf624c2686;hb=dac1bb975265d33e7aeb0e3fc0342260613af9d1;hp=dd423f6b5500b0f985689a71a81b4d60282865b8;hpb=82b23ce7958e67d33e22868c9f42cb81484a0ed3;p=pulseview.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dd423f6..2fd35b1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,6 +64,10 @@ if(ENABLE_DECODE)
 	list(APPEND PKGDEPS libsigrokdecode>=0.3.0)
 endif()
 
+if(ANDROID)
+	list(APPEND PKGDEPS libsigrokandroidutils>=0.1.0)
+endif()
+
 find_package(PkgConfig)
 pkg_check_modules(PKGDEPS REQUIRED ${PKGDEPS})
 
@@ -120,6 +124,7 @@ configure_file (
 
 set(pulseview_SOURCES
 	main.cpp
+	pv/application.cpp
 	pv/devicemanager.cpp
 	pv/mainwindow.cpp
 	pv/sigsession.cpp
@@ -134,13 +139,12 @@ set(pulseview_SOURCES
 	pv/device/device.cpp
 	pv/device/file.cpp
 	pv/device/devinst.cpp
-	pv/device/inputfile.cpp
 	pv/device/sessionfile.cpp
 	pv/dialogs/about.cpp
 	pv/dialogs/connect.cpp
 	pv/dialogs/storeprogress.cpp
 	pv/popups/deviceoptions.cpp
-	pv/popups/probes.cpp
+	pv/popups/channels.cpp
 	pv/prop/bool.cpp
 	pv/prop/double.cpp
 	pv/prop/enum.cpp
@@ -182,7 +186,7 @@ set(pulseview_HEADERS
 	pv/dialogs/about.h
 	pv/dialogs/connect.h
 	pv/dialogs/storeprogress.h
-	pv/popups/probes.h
+	pv/popups/channels.h
 	pv/popups/deviceoptions.h
 	pv/prop/bool.h
 	pv/prop/double.h
@@ -243,12 +247,6 @@ if(ENABLE_DECODE)
 		pv/widgets/decodergroupbox.h
 		pv/widgets/decodermenu.h
 	)
-
-	if(ANDROID)
-		list(APPEND pulseview_SOURCES
-			    android/envsetup.cpp
-		)
-	endif()
 endif()
 
 if(WIN32)
@@ -258,6 +256,10 @@ if(WIN32)
 	list(APPEND pulseview_SOURCES pulseviewico.rc)
 endif()
 
+if(ANDROID)
+	list(APPEND pulseview_SOURCES android/loghandler.cpp)
+endif()
+
 if(Qt5Core_FOUND)
 	qt5_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS})
 	qt5_wrap_ui(pulseview_FORMS_HEADERS ${pulseview_FORMS})
@@ -273,7 +275,7 @@ endif()
 #= Global Definitions
 #-------------------------------------------------------------------------------
 
-add_definitions(${QT_DEFINITIONS})
+add_definitions(${QT_DEFINITIONS} -DQT_NO_KEYWORDS)
 add_definitions(-D__STDC_LIMIT_MACROS)
 add_definitions(-Wall -Wextra)
 add_definitions(-std=c++11)
@@ -339,6 +341,10 @@ if(WIN32)
 	list(APPEND PULSEVIEW_LINK_LIBS "-lqsvg")
 endif()
 
+if(ANDROID)
+	list(APPEND PULSEVIEW_LINK_LIBS "-llog")
+endif()
+
 if(ANDROID)
 add_library(${PROJECT_NAME} SHARED
 	${pulseview_SOURCES}