changelog updated

[mardrone] / mardrone / mardrone.pro

diff --git a/mardrone/mardrone.pro b/mardrone/mardrone.pro
index ac9ebb8..ea2fc49 100644 (file)
--- a/mardrone/mardrone.pro
+++ b/mardrone/mardrone.pro
@@ -25,7 +25,9 @@ DEFINES+=HAVE_SDL
 android {
  LIBS += -L../mardrone/ardrone-lib-android -lvlib -lsdk
 # If you got cannot locate '__aeabi_f2uiz'..., uncomment following and point libgcc.a
- LIBS += ~/necessitas/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/lib/gcc/arm-linux-androideabi/4.4.3/libgcc.a
+# LIBS += ~/necessitas/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/lib/gcc/arm-linux-androideabi/4.4.3/libgcc.a
+#For mac build environment
+ LIBS += ~/necessitas/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/darwin-x86/lib/gcc/arm-linux-androideabi/4.4.3/libgcc.a
 }
 
 
@@ -199,7 +201,9 @@ OTHER_FILES += \
     android/src/org/kde/necessitas/ministro/IMinistroCallback.aidl \
     android/AndroidManifest.xml \
     deploy.pri \
-    android/version.xml
+    android/version.xml \
+    ardrone_android.qml \
+    ConfigDialogAndroid.qml
 
 unix:!symbian:!android {
     maemo5 {
@@ -232,15 +236,25 @@ RESOURCES += \
 android {
 qtcomponents.source = imports
 qtcomponents.target =
+# Themes are needed only for MeeGo components
 themes.source = themes
 themes.target =
 DEPLOYMENTFOLDERS = qtcomponents themes
 
+# For MeeGo components for android
 qmlplugins.files = plugins/libmeegoplugin.so
 qmlplugins.files += plugins/libmeegoextrasplugin.so
+# Common
 qmlplugins.files += plugins/libqtcomponentsplugin_1_1.so
-qmlplugins.path = /libs/armeabi
-
+# for Symbian components for Android, comment out if not used
+qmlplugins.files += plugins/libandroidplugin_1_1.so
+   x86 {
+      qmlplugins.path = /libs/x86
+    } else: armeabi-v7a {
+            qmlplugins.path = /libs/armeabi-v7a
+    } else {
+            qmlplugins.path = /libs/armeabi
+   }
 INSTALLS += qmlplugins
 }
 
@@ -281,3 +295,5 @@ ios:include($$[QMAKE_MKSPECS]/common/ios/qiosapp.conf)
 
 
 
+
+