ync

diff --git a/mardrone/mardrone.pro b/mardrone/mardrone.pro
index 0ec04e0..00de90c 100644 (file)
--- a/mardrone/mardrone.pro
+++ b/mardrone/mardrone.pro
@@ -11,21 +11,30 @@ MOBILITY += sensors
 TARGET = mardrone
 TEMPLATE = app
 AR_DRONE_SDK = ARDrone_SDK_Version_1_8_20110726
-#LIBS += -Lardrone-lib-x86 -lvlib -lsdk
-#LIBS += -L../mardrone/ardrone-lib-arm -lvlib -lsdk
+unix:!mac:!ios:!android: LIBS += -Lardrone-lib-x86 -lvlib -lsdk
+!isEmpty(MEEGO_VERSION_MAJOR): LIBS += -L../mardrone/ardrone-lib-arm -lvlib -lsdk
 
-#For Android
-macx {
+# for Mac OSX
+macx:!ios {
 message("Compiling for Mac OSx")
 LIBS += -L../mardrone/ardrone-lib-osx -lvlib
 LIBS += -framework SDL
 DEFINES+=HAVE_SDL
 }
+#For Android
 android {
- LIBS += -L../mardrone/ardrone-lib-android -lvlib -lsdk  /home/kate/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 += -L../mardrone/ardrone-lib-android -lvlib -lsdk
+#/home/kate/necessitas/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/lib/gcc/arm-linux-androideabi/4.4.3/libgcc.a
 }
+
+
 SUBDIRS += $${AR_DRONE_SDK}
 
+ios {
+    message("Compiling for IOS")
+    DEFINES+=QT_IOS
+}
+
 system(pkg-config --exists QtSensors){
     message("I have QtSensors")
     DEFINES+=QT_SENSORS
@@ -43,7 +52,11 @@ SOURCES += main.cpp\
     gauges/gaugetape.cpp \
     gauges/gaugehorizon.cpp \
     dronelib/joystick.cpp \
-    qdeclarativetoucharea.cpp
+    qdeclarativetoucharea.cpp \
+    gauges/gaugearc.cpp \
+    uilistelement.cpp \
+    gauges/gaugehsi.cpp \
+    gauges/gaugeplugin.cpp
 
 INCLUDEPATH += dronelib \
                gauges \
@@ -63,7 +76,10 @@ HEADERS  +=  dronelib/dronecontrol.h \
     gauges/gaugetape.h \
     gauges/gaugehorizon.h \
     dronelib/joystick.h \
-    qdeclarativetoucharea.h
+    qdeclarativetoucharea.h \
+    gauges/gaugearc.h \
+    uilistelement.h \
+    gauges/gaugehsi.h
 
 system(pkg-config --exists sdl){
     message("I have sdl")
@@ -114,7 +130,42 @@ OTHER_FILES += \
     ardrone_symbian.qml \
     ConfigDialogSymbian.qml \
     gauges/GenericGauge.qml \
-    gauges/HeadingGauge.qml
+    gauges/HeadingGauge.qml \
+    ardrone_plainqml.qml \
+    gauges/gauges.pro \
+    android/AndroidManifest.xml \
+    android/res/drawable/icon.png \
+    android/res/drawable/logo.png \
+    android/res/drawable-hdpi/icon.png \
+    android/res/drawable-ldpi/icon.png \
+    android/res/drawable-mdpi/icon.png \
+    android/res/layout/splash.xml \
+    android/res/values/libs.xml \
+    android/res/values/strings.xml \
+    android/res/values-de/strings.xml \
+    android/res/values-el/strings.xml \
+    android/res/values-es/strings.xml \
+    android/res/values-et/strings.xml \
+    android/res/values-fa/strings.xml \
+    android/res/values-fr/strings.xml \
+    android/res/values-id/strings.xml \
+    android/res/values-it/strings.xml \
+    android/res/values-ja/strings.xml \
+    android/res/values-ms/strings.xml \
+    android/res/values-nb/strings.xml \
+    android/res/values-nl/strings.xml \
+    android/res/values-pl/strings.xml \
+    android/res/values-pt-rBR/strings.xml \
+    android/res/values-ro/strings.xml \
+    android/res/values-rs/strings.xml \
+    android/res/values-ru/strings.xml \
+    android/res/values-zh-rCN/strings.xml \
+    android/res/values-zh-rTW/strings.xml \
+    android/src/org/kde/necessitas/ministro/IMinistro.aidl \
+    android/src/org/kde/necessitas/ministro/IMinistroCallback.aidl \
+    android/src/org/kde/necessitas/origo/QtActivity.java \
+    android/src/org/kde/necessitas/origo/QtApplication.java \
+    android/version.xml
 
 unix:!symbian {
     maemo5 {
@@ -141,8 +192,7 @@ unix:!symbian {
 RESOURCES += \
     ardrone.qrc
 
-
-
+ios:include($$[QMAKE_MKSPECS]/common/ios/qiosapp.conf)