diff options
| -rw-r--r-- | android/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | libdash/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | scripts/build-package.sh | 2 | ||||
| -rw-r--r-- | viper.pro | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index f8e00c3a..557e2331 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -69,7 +69,7 @@ </application> - <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="26"/> + <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="27"/> <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/> <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application. diff --git a/libdash/CMakeLists.txt b/libdash/CMakeLists.txt index 0e47c993..ded15cfb 100644 --- a/libdash/CMakeLists.txt +++ b/libdash/CMakeLists.txt @@ -11,9 +11,9 @@ if(ANDROID_API) elseif (COMPILE_FOR_IOS) set(CMAKE_CXX_FLAGS "-std=c++0x -g -DLOG_BUILD") find_package(LibXml2 REQUIRED) - find_host_package(OpenSSL REQUIRED) + find_package(OpenSSL REQUIRED) find_package(ZLIB REQUIRED) - find_host_package(CURL REQUIRED) + find_package(CURL REQUIRED) else () set(CMAKE_CXX_FLAGS "-std=c++0x -g -DLOG_BUILD") find_package(LibXml2 REQUIRED) diff --git a/scripts/build-package.sh b/scripts/build-package.sh index c2852b67..52b22a0f 100644 --- a/scripts/build-package.sh +++ b/scripts/build-package.sh @@ -8,7 +8,7 @@ APT_PATH=`which apt-get` || true apt_get=${APT_PATH:-"/usr/local/bin/apt-get"} PACKAGE_NAME="VIPER" -VIPER_DEPS_UBUNTU="zlib1g-dev git-core build-essential libxml2-dev libcurl4-openssl-dev \ +VIPER_DEPS_UBUNTU="libconfig++-dev zlib1g-dev git-core build-essential libxml2-dev libcurl4-openssl-dev \ libqtav-dev qt5-default libqt5svg5-dev qtdeclarative5-dev libqt5charts5-dev \ qtmultimedia5-dev libqt5multimediawidgets5 libqt5multimedia5-plugins libqt5multimedia5 \ libhicntransport-dev libavcodec-dev libavutil-dev libavformat-dev" @@ -289,7 +289,7 @@ unix:!macx:!android { INCLUDEPATH += /usr/include INCLUDEPATH += /usr/include/libdash equals(TRANSPORT_LIBRARY, "HICNET") { - LIBS += -L/usr/local/lib -ldash -lhicntransport -lavcodec -lavutil -lavformat + LIBS += -L/usr/local/lib -ldash -lhicntransport -lavcodec -lavutil -lavformat -lconfig++ DEFINES += "HICNET=ON" } else { LIBS += -L/usr/local/lib -ldash -licnet -lavcodec -lavutil -lavformat @@ -307,7 +307,7 @@ macx:!ios { INCLUDEPATH += $$[QT_HOST_PREFIX]/include/ INCLUDEPATH += $$[QT_HOST_PREFIX]/lib/QtAV.framework/Headers equals(TRANSPORT_LIBRARY, "HICNET") { - LIBS += -L"/usr/local/lib" -framework CoreServices -ldash -lavformat -lavutil -lavcodec -lswscale -lhicntransport -lssl -lcrypto + LIBS += -L"/usr/local/lib" -framework CoreServices -ldash -lavformat -lavutil -lavcodec -lswscale -lhicntransport -lssl -lcrypto -lconfig++ LIBS += -F$$[QT_HOST_PREFIX]/lib/ -framework QtAV DEFINES += "HICNET=ON" } else { @@ -332,7 +332,7 @@ android { INCLUDEPATH += $$(DISTILLARY_INSTALLATION_PATH)/include INCLUDEPATH += $$(DISTILLARY_INSTALLATION_PATH)/include/libdash equals(TRANSPORT_LIBRARY, "HICNET") { - LIBS += -L"$$(DISTILLARY_INSTALLATION_PATH)/lib" -ldash -lhicntransport -lhicn -lparc -lavcodec -lavutil -lavformat -lswresample -lcurl -lxml2 -lssl -lcrypto + LIBS += -L"$$(DISTILLARY_INSTALLATION_PATH)/lib" -ldash -lhicntransport -lhicn -lparc -lavcodec -lavutil -lavformat -lswresample -lcurl -lxml2 -lssl -lcrypto -lconfig++ LIBS += -L"$$(QT_HOME)/$$(QT_VERSION)/android_$$(ANDROID_ARCH)/lib/" -lQtAV DEFINES += "HICNET=ON" ANDROID_EXTRA_LIBS += $$(DISTILLARY_INSTALLATION_PATH)/lib/libswresample.so |