diff options
author | Angelo Mantellini (manangel) <angelo.mantellini@irt-systemx.fr> | 2017-04-24 18:43:57 +0200 |
---|---|---|
committer | Angelo Mantellini (manangel) <angelo.mantellini@irt-systemx.fr> | 2017-04-24 18:43:57 +0200 |
commit | 6dc10f6d3e410544b1068de2565cab2b9b8aa3ec (patch) | |
tree | 0778e45f04bbac376ac25b0383f64c01c0b95fc9 /viper.pro | |
parent | ab05f3c8bb9112e61804515d1e06f7afec2e3fa6 (diff) |
corrections
Change-Id: I07d00ea0d02b044d543a83bca10f8e73a281f90b
Signed-off-by: Angelo Mantellini (manangel) <angelo.mantellini@irt-systemx.fr>
Diffstat (limited to 'viper.pro')
-rw-r--r-- | viper.pro | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -18,8 +18,7 @@ android { QT += androidextras } -CONFIG -= release -CONFIG += debug +CONFIG += release CONFIG += c++11 @@ -280,10 +279,11 @@ unix:!macx:!android { } macx:!ios { + #SOURCE is ok INCLUDEPATH += /usr/local/include INCLUDEPATH += /usr/local/include/libdash - LIBS += -L"/usr/local/lib" -framework CoreServices -ldash -lavformat -lavutil -lavcodec -lboost_system -lboost_regex -lswscale -licnet -lssl -lcrypto + LIBS += -framework CoreServices -L"/usr/local/lib" -ldash -lavformat -lavutil -lavcodec -lboost_system -lboost_regex -lswscale -licnet -lssl -lcrypto } SOURCES *= main.cpp android { @@ -298,8 +298,9 @@ android { android/gradlew.bat ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android - - LIBS += -lconsumer-producer -ldash -lavcodec -lavutil -lavformat -lboost_system # -lccnx_api_control -lccnx_api_notify -lccnx_api_portal -lccnx_common -lccnx_transport_rta #-lparc -lcrypto #-llongbow-textplain -llongbow-ansiterm -llongbow + INCLUDEPATH += $$(QT_HOME)/Qt/5.7/android_armv7/include + INCLUDEPATH += $$(QT_HOME)/Qt/5.7/android_armv7/include/libdash + LIBS += -lstdc++ -licnet -lgnustl_shared -ldash -lavcodec -lavutil -lavformat -lboost_system # -lccnx_api_control -lccnx_api_notify -lccnx_api_portal -lccnx_common -lccnx_transport_rta #-lparc -lcrypto #-llongbow-textplain -llongbow-ansiterm -llongbow #user can put fonts in android/assets/fonts } |