aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAngelo Mantellini <manangel@cisco.com>2021-04-16 11:58:47 +0200
committerAngelo Mantellini <angelo.mantellini@cisco.com>2021-04-16 12:03:45 +0200
commit2c95aad94de3cc4d7a6893cf4be6158b0e79b8a0 (patch)
tree0aeab20135134d3c1f7465a7e7a417f49e099133
parent37bd1e138e0174ce250647968af1021359c1e9e4 (diff)
[CICN-37] update viper to support to last version of hicnviper/master
Signed-off-by: Angelo Mantellini <manangel@cisco.com> Change-Id: Ib40cafbf5d648a282e6dc58bb3537ab4723dd2ee
-rw-r--r--scripts/build-package.sh2
-rw-r--r--viper.pro6
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/build-package.sh b/scripts/build-package.sh
index c2852b6..52b22a0 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"
diff --git a/viper.pro b/viper.pro
index 5b599b3..5b15333 100644
--- a/viper.pro
+++ b/viper.pro
@@ -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