From 079b29607822a7e8a0bf67a6aff3d4290d8739c7 Mon Sep 17 00:00:00 2001 From: Masa Date: Fri, 8 Jul 2016 16:28:26 -0700 Subject: [PATCH] Missed this file: the updated project file. This is the first beta (at least, submitted for review, at this point). --- client/SFOsaka/SFOsaka.pro | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/client/SFOsaka/SFOsaka.pro b/client/SFOsaka/SFOsaka.pro index 148f870..4a617e3 100644 --- a/client/SFOsaka/SFOsaka.pro +++ b/client/SFOsaka/SFOsaka.pro @@ -35,7 +35,7 @@ SOURCES = MainPage.qml \ RESOURCES += qml.qrc \ translations.qrc \ -# Additional import path used to resolve QML modules in Qt Creator's code model +# Additional import path used to resolve QML modules in Qt Creators code model QML_IMPORT_PATH = # Default rules for deployment. @@ -85,6 +85,14 @@ iphoneos{ PRE_TARGETDEPS += $$PWD/../build-FJClient-iphoneos_clang_Qt_5_6_0_for_iOS-Debug/libFJClient.a } android{ +PRE_TARGETDEPS += $$PWD/../build-FJClient-Android_for_armeabi_v7a_GCC_4_9_Qt_5_6_0-Debug/libFJClient.a +} +osx { PRE_TARGETDEPS += $$PWD/../build-FJClient-Desktop_Qt_5_6_0_clang_64bit-Debug/libFJClient.a } +contains(ANDROID_TARGET_ARCH,armeabi-v7a) { + ANDROID_EXTRA_LIBS = \ + /Users/wyan/src/github/SFOsaka/client/SFOsaka/libcrypto.so \ + /Users/wyan/src/github/SFOsaka/client/SFOsaka/libssl.so +}