X-Git-Url: http://git.maemo.org/git/?p=mardrone;a=blobdiff_plain;f=mardrone%2Fmardrone.pro;h=00de90ce4982aa37f6300ec5f217f17355f8f708;hp=92169f8c81fb57f87881b023dc0f033a9e8c6138;hb=8f3f629260d50245d19c50ebfb07c766b8937c30;hpb=5c7bd9dd6553426975ff21d029f59e0134f25394 diff --git a/mardrone/mardrone.pro b/mardrone/mardrone.pro index 92169f8..00de90c 100644 --- a/mardrone/mardrone.pro +++ b/mardrone/mardrone.pro @@ -6,23 +6,61 @@ QT += core gui declarative network - -CONFIG += mobility +CONFIG += mobility link_pkgconfig +MOBILITY += sensors TARGET = mardrone TEMPLATE = app -AR_DRONE_SDK= $$(HOME)/ARDrone_SDK_1_5_Version_20101004 -LIBS +=-lQtComponents -L$${AR_DRONE_SDK}/lib -lvlib -lsdk +AR_DRONE_SDK = ARDrone_SDK_Version_1_8_20110726 +unix:!mac:!ios:!android: LIBS += -Lardrone-lib-x86 -lvlib -lsdk +!isEmpty(MEEGO_VERSION_MAJOR): LIBS += -L../mardrone/ardrone-lib-arm -lvlib -lsdk + +# 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 +} + +SUBDIRS += $${AR_DRONE_SDK} + +ios { + message("Compiling for IOS") + DEFINES+=QT_IOS +} + +system(pkg-config --exists QtSensors){ + message("I have QtSensors") + DEFINES+=QT_SENSORS +} + +message("QMAKESPEC is:") +message($$QMAKESPEC) SOURCES += main.cpp\ - dronecontrol.cpp \ - navdata.cpp \ - video.cpp \ - gauge.cpp \ - gaugelabel.cpp \ - gaugehorizon.cpp - -INCLUDEPATH += $${AR_DRONE_SDK}/ARDroneLib/Soft/Common \ + dronelib/dronecontrol.cpp \ + dronelib/navdata.cpp \ + dronelib/video.cpp \ + gauges/gauge.cpp \ + gauges/gaugelabel.cpp \ + gauges/gaugetape.cpp \ + gauges/gaugehorizon.cpp \ + dronelib/joystick.cpp \ + qdeclarativetoucharea.cpp \ + gauges/gaugearc.cpp \ + uilistelement.cpp \ + gauges/gaugehsi.cpp \ + gauges/gaugeplugin.cpp + +INCLUDEPATH += dronelib \ + gauges \ + $${AR_DRONE_SDK}/ARDroneLib/Soft/Common \ $${AR_DRONE_SDK}/ARDroneLib/VP_SDK \ $${AR_DRONE_SDK}/ARDroneLib/VP_SDK/VP_Os/linux \ $${AR_DRONE_SDK}/ARDroneLib/VP_SDK/VP_Os \ @@ -30,17 +68,29 @@ INCLUDEPATH += $${AR_DRONE_SDK}/ARDroneLib/Soft/Common \ $${AR_DRONE_SDK}/ARDroneLib/VLIB \ $${AR_DRONE_SDK}/ARDroneLib -HEADERS += dronecontrol.h \ - navdata.h \ - video.h \ - gauge.h \ - gaugelabel.h \ - gaugehorizon.h +HEADERS += dronelib/dronecontrol.h \ + dronelib/navdata.h \ + dronelib/video.h \ + gauges/gauge.h \ + gauges/gaugelabel.h \ + gauges/gaugetape.h \ + gauges/gaugehorizon.h \ + dronelib/joystick.h \ + qdeclarativetoucharea.h \ + gauges/gaugearc.h \ + uilistelement.h \ + gauges/gaugehsi.h + +system(pkg-config --exists sdl){ + message("I have sdl") + DEFINES+=HAVE_SDL + SOURCES += + HEADERS += + LIBS+=-lSDL +} OTHER_FILES += \ - ardrone.qml \ - JoyStick.qml \ JoyStick2.qml \ debian/changelog \ debian/compat \ @@ -50,7 +100,72 @@ OTHER_FILES += \ debian/rules \ ardrone1.desktop \ BarGauge.qml \ - ConfigDialog.qml + ConfigDialog.qml \ + ardrone_harmattan.qml \ + ardrone_desktop.qml \ + ConfigDialogDesktop.qml \ + gauges/AltGauge.qml \ + gauges/alt2.png \ + gauges/needle1.png \ + gauges/needle2.png \ + gauges/EfisPFD.qml \ + gauges/qmldir.txt \ + dronelib/JoyStickCalibrator.qml \ + dronelib/JoyStickIndicator.qml \ + CalibrateDialog.qml \ + JoyStickCalibrator.qml \ + JoyStickIndicator.qml \ + JoyStickTouch.qml \ + gauges/qmldir \ + qtc_packaging/debian_harmattan/rules \ + qtc_packaging/debian_harmattan/README \ + qtc_packaging/debian_harmattan/manifest.aegis \ + qtc_packaging/debian_harmattan/copyright \ + qtc_packaging/debian_harmattan/control \ + qtc_packaging/debian_harmattan/compat \ + qtc_packaging/debian_harmattan/changelog \ + gauges/AttitudeGauge.qml \ + CalibrateDialogDesktop.qml \ + JoyStickCalibratorDesktop.qml \ + ardrone_symbian.qml \ + ConfigDialogSymbian.qml \ + gauges/GenericGauge.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 { @@ -65,6 +180,9 @@ unix:!symbian { desktopfile.files = $${TARGET}.desktop maemo5 { desktopfile.path = /usr/share/applications/hildon + icon64.path = /usr/share/icons/hicolor/64x64/apps + icon64.files = $${TARGET}.png + INSTALLS += icon64 } else { desktopfile.path = /usr/share/applications } @@ -73,3 +191,34 @@ unix:!symbian { RESOURCES += \ ardrone.qrc + +ios:include($$[QMAKE_MKSPECS]/common/ios/qiosapp.conf) + + + + + + + + + + + + + + + + + + + + + + + + + + + + +