Reorganized project to avoid the ".pro not found" by having all the

pro files in the same directory. With this change the android library
now builds properly.

This also fixes the parallel compilation problem that happened when
building using +8 cores.
This commit is contained in:
codestation
2015-03-21 14:48:25 -04:30
parent c223016725
commit 9f790dc788
106 changed files with 13921 additions and 0 deletions

35
android/android.pro Normal file
View File

@@ -0,0 +1,35 @@
include(../config.pri)
include(../common/defines.pri)
TARGET = qcma_android
TEMPLATE=app
LIBS += -L../common -lqcma_common
# this library needs to link statically their deps but Qt doesn't pass --static to PKGCONFIG
QMAKE_CXXFLAGS += $$system(pkg-config --static --cflags libvitamtp libavformat libavcodec libavutil libswscale)
LIBS += $$system(pkg-config --static --libs libvitamtp libavformat libavcodec libavutil libswscale)
SOURCES += \
main_android.cpp
# headlessmanager.cpp
#HEADERS += \
# headlessmanager.h
DISTFILES += \
../android-src/gradle/wrapper/gradle-wrapper.jar \
../android-src/AndroidManifest.xml \
../android-src/gradlew.bat \
../android-src/res/values/libs.xml \
../android-src/build.gradle \
../android-src/gradle/wrapper/gradle-wrapper.properties \
../android-src/gradlew \
android-src/gradle/wrapper/gradle-wrapper.jar \
android-src/AndroidManifest.xml \
android-src/gradlew.bat \
android-src/res/values/libs.xml \
android-src/build.gradle \
android-src/gradle/wrapper/gradle-wrapper.properties \
android-src/gradlew
ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android-src