diff options
| author |   Mauro Sardara <msardara+fdio@cisco.com> | 2017-04-25 09:52:18 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2017-04-25 09:52:18 +0000 |
| commit | 4a296022e120e0d9007b18dde0b0a6a4310ddaf8 (patch) | |
| tree | f324e63b1abf72d22e572a247804bf2447afc5fb | |
| parent | bacb8a7a866bd040f1fb04035673e74efa7430fd (diff) | |
| parent | 88643d4d0038b883b21d41e793955fdac3b22890 (diff) | |
Merge "correct include path android" into viper/master
| -rw-r--r-- | viper.pro | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -296,10 +296,9 @@ android { android/gradle/wrapper/gradle-wrapper.properties \ android/gradlew \ android/gradlew.bat - - ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android - INCLUDEPATH += $$(QT_HOME)/Qt/5.7/android_armv7/include - INCLUDEPATH += $$(QT_HOME)/Qt/5.7/android_armv7/include/libdash + ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android + INCLUDEPATH += $$(QT_HOME)/5.7/android_armv7/include + INCLUDEPATH += $$(QT_HOME)/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 } |