Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-25 06:40:58 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

More cleanup of .pro files

Browse source
This commit is contained in:
Gioacchino Mazzurco 2018-01-30 18:25:04 +01:00
parent 00125864ff
commit 4d6085047a
2 changed files with 21 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

5
openpgpsdk/src/openpgpsdk.pro
View file

@ -124,8 +124,8 @@ SOURCES += openpgpsdk/opsstring.c
android-* { android-* {
## Add this here and not in retroshare.pri because static library are very ## Add this here because static library are very sensible to order in
## sensible to order in command line ## command line
LIBS += -L$$NATIVE_LIBS_TOOLCHAIN_PATH/sysroot/usr/lib/ -lssl LIBS += -L$$NATIVE_LIBS_TOOLCHAIN_PATH/sysroot/usr/lib/ -lssl
INCLUDEPATH += $$NATIVE_LIBS_TOOLCHAIN_PATH/sysroot/usr/include INCLUDEPATH += $$NATIVE_LIBS_TOOLCHAIN_PATH/sysroot/usr/include
DEPENDPATH += $$NATIVE_LIBS_TOOLCHAIN_PATH/sysroot/usr/include DEPENDPATH += $$NATIVE_LIBS_TOOLCHAIN_PATH/sysroot/usr/include
@ -135,5 +135,4 @@ android-* {
INCLUDEPATH += $$NATIVE_LIBS_TOOLCHAIN_PATH/sysroot/usr/include INCLUDEPATH += $$NATIVE_LIBS_TOOLCHAIN_PATH/sysroot/usr/include
DEPENDPATH += $$NATIVE_LIBS_TOOLCHAIN_PATH/sysroot/usr/include DEPENDPATH += $$NATIVE_LIBS_TOOLCHAIN_PATH/sysroot/usr/include
PRE_TARGETDEPS += $$NATIVE_LIBS_TOOLCHAIN_PATH/sysroot/usr/lib/libcrypto.a PRE_TARGETDEPS += $$NATIVE_LIBS_TOOLCHAIN_PATH/sysroot/usr/lib/libcrypto.a
} }

28
retroshare-qml-app/src/retroshare-qml-app.pro
View file

@ -21,20 +21,15 @@ android-* {
QT += androidextras QT += androidextras
HEADERS += NativeCalls.h androidplatforminteracions.h HEADERS += NativeCalls.h androidplatforminteracions.h
SOURCES += NativeCalls.cpp androidplatforminteracions.cpp SOURCES += NativeCalls.cpp androidplatforminteracions.cpp
} else {
HEADERS += defaultplatforminteracions.h
SOURCES += defaultplatforminteracions.cpp
}
# Additional import path used to resolve QML modules in Qt Creator's code model ANDROID_EXTRA_LIBS *= $$NATIVE_LIBS_TOOLCHAIN_PATH/sysroot/usr/lib/libsqlite3.so
#QML_IMPORT_PATH = ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
#QML2_IMPORT_PATH =
# Default rules for deployment. # Default rules for deployment.
include(deployment.pri) include(deployment.pri)
DISTFILES += \ DISTFILES += \
android/AndroidManifest.xml \ android/AndroidManifest.xml \
android/gradle/wrapper/gradle-wrapper.jar \ android/gradle/wrapper/gradle-wrapper.jar \
android/gradlew \ android/gradlew \
@ -44,9 +39,12 @@ DISTFILES += \
android/gradlew.bat \ android/gradlew.bat \
icons/retroshare.png icons/retroshare.png
ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android } else {
DEPENDPATH *= ../../libretroshare/src HEADERS += defaultplatforminteracions.h
INCLUDEPATH *= ../../libretroshare/src SOURCES += defaultplatforminteracions.cpp
PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a }
LIBS *= ../../libretroshare/src/lib/libretroshare.a
# Additional import path used to resolve QML modules in Qt Creator's code model
#QML_IMPORT_PATH =
#QML2_IMPORT_PATH =