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

Make .pro files compiler agnostic on Android

Browse source
This commit is contained in:
Gioacchino Mazzurco 2018-01-30 18:11:31 +01:00
parent da2fc01952
commit ebfe50f814
6 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libretroshare/src/libretroshare.pro
View file

@ -917,7 +917,7 @@ test_bitdht {
################################# Android ##################################### ################################# Android #####################################
android-g++ { android-* {
## ifaddrs is missing on Android to add them don't use the one from ## ifaddrs is missing on Android to add them don't use the one from
## https://github.com/morristech/android-ifaddrs ## https://github.com/morristech/android-ifaddrs
## because they crash, use QNetworkInterface from Qt instead ## because they crash, use QNetworkInterface from Qt instead

2
openpgpsdk/src/openpgpsdk.pro
View file

@ -122,7 +122,7 @@ SOURCES += openpgpsdk/opsstring.c
################################# Android ##################################### ################################# Android #####################################
android-g++ { android-* {
## Add this here and not in retroshare.pri because static library are very ## Add this here and not in retroshare.pri because static library are very
## sensible to order in command line ## sensible to order in command line

2
retroshare-android-notify-service/src/retroshare-android-notify-service.pro
View file

@ -12,7 +12,7 @@ RESOURCES += qml.qrc
TEMPLATE = app TEMPLATE = app
android-g++ { android-* {
TEMPLATE = lib TEMPLATE = lib
QT += androidextras QT += androidextras
} }

6
retroshare-android-service/src/retroshare-android-service.pro
View file

@ -6,10 +6,10 @@ QT += core network
QT -= gui QT -= gui
CONFIG += c++11 CONFIG += c++11
android-g++:CONFIG += dll android-*:CONFIG += dll
android-g++:TEMPLATE = lib android-*:TEMPLATE = lib
!android-g++:TEMPLATE = app !android-*:TEMPLATE = app
DEPENDPATH *= ../../libresapi/src DEPENDPATH *= ../../libresapi/src
INCLUDEPATH *= ../../libresapi/src INCLUDEPATH *= ../../libresapi/src

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

@ -17,7 +17,7 @@ RESOURCES += qml.qrc
# Platform interaction specific code # Platform interaction specific code
android-g++ { 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

2
retroshare.pri
View file

@ -111,7 +111,7 @@ linux-* {
} }
} }
android-g++ { android-* {
isEmpty(NATIVE_LIBS_TOOLCHAIN_PATH) { isEmpty(NATIVE_LIBS_TOOLCHAIN_PATH) {
NATIVE_LIBS_TOOLCHAIN_PATH = $$(NATIVE_LIBS_TOOLCHAIN_PATH) NATIVE_LIBS_TOOLCHAIN_PATH = $$(NATIVE_LIBS_TOOLCHAIN_PATH)
} }