mirror of
https://github.com/PurpleI2P/i2pd.git
synced 2025-07-11 04:33:55 +02:00
Merge branch 'upstream-openssl' into restricted_routes
This commit is contained in:
parent
93deb37c94
commit
63c36e917e
44 changed files with 2523 additions and 148 deletions
|
@ -13,13 +13,18 @@ TEMPLATE = app
|
|||
QMAKE_CXXFLAGS *= -std=c++11
|
||||
|
||||
# git clone https://github.com/PurpleI2P/Boost-for-Android-Prebuilt.git
|
||||
# git clone https://github.com/PurpleI2P/OpenSSL-for-Android-Prebuilt
|
||||
# git clone https://github.com/PurpleI2P/OpenSSL-for-Android-Prebuilt.git
|
||||
# git clone https://github.com/PurpleI2P/android-ifaddrs.git
|
||||
# change to your own
|
||||
BOOST_PATH = /mnt/media/android/Boost-for-Android-Prebuilt
|
||||
OPENSSL_PATH = /mnt/media/android/OpenSSL-for-Android-Prebuilt
|
||||
IFADDRS_PATH = /mnt/media/android/android-ifaddrs
|
||||
|
||||
# Steps in Android SDK manager:
|
||||
# 1) Check Extras/Google Support Library https://developer.android.com/topic/libraries/support-library/setup.html
|
||||
# 2) Check API 11
|
||||
# Finally, click Install.
|
||||
|
||||
SOURCES += DaemonQT.cpp\
|
||||
mainwindow.cpp \
|
||||
../../HTTPServer.cpp ../../I2PControl.cpp ../../UPnP.cpp ../../Daemon.cpp ../../Config.cpp \
|
||||
|
@ -66,8 +71,7 @@ SOURCES += DaemonQT.cpp\
|
|||
../../TunnelPool.cpp \
|
||||
../../util.cpp \
|
||||
../../i2pd.cpp \
|
||||
$$IFADDRS_PATH/ifaddrs.c \
|
||||
i2pd_qt_gui.cpp
|
||||
$$IFADDRS_PATH/ifaddrs.c
|
||||
|
||||
HEADERS += DaemonQT.h mainwindow.h \
|
||||
../../HTTPServer.h ../../I2PControl.h ../../UPnP.h ../../Daemon.h ../../Config.h \
|
||||
|
@ -120,9 +124,7 @@ HEADERS += DaemonQT.h mainwindow.h \
|
|||
../../TunnelPool.h \
|
||||
../../util.h \
|
||||
../../version.h \
|
||||
$$IFADDRS_PATH/ifaddrs.h \
|
||||
i2pd_qt_gui.h
|
||||
|
||||
$$IFADDRS_PATH/ifaddrs.h
|
||||
|
||||
FORMS += mainwindow.ui
|
||||
|
||||
|
@ -135,6 +137,7 @@ LIBS += -lz
|
|||
android {
|
||||
message("Using Android settings")
|
||||
DEFINES += ANDROID=1
|
||||
DEFINES += __ANDROID__
|
||||
INCLUDEPATH += $$BOOST_PATH/boost_1_53_0/include \
|
||||
$$OPENSSL_PATH/openssl-1.0.2/include \
|
||||
$$IFADDRS_PATH
|
||||
|
@ -144,6 +147,9 @@ DISTFILES += \
|
|||
ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
|
||||
|
||||
equals(ANDROID_TARGET_ARCH, armeabi-v7a){
|
||||
|
||||
DEFINES += ANDROID_ARM7A
|
||||
|
||||
# http://stackoverflow.com/a/30235934/529442
|
||||
LIBS += -L$$BOOST_PATH/boost_1_53_0/armeabi-v7a/lib \
|
||||
-lboost_system-gcc-mt-1_53 \
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue