diff options
Diffstat (limited to 'libsowatch')
| -rw-r--r-- | libsowatch/libsowatch.pro | 12 | ||||
| -rw-r--r-- | libsowatch/sowatch_global.h | 13 |
2 files changed, 14 insertions, 11 deletions
diff --git a/libsowatch/libsowatch.pro b/libsowatch/libsowatch.pro index cb77a17..6f657c8 100644 --- a/libsowatch/libsowatch.pro +++ b/libsowatch/libsowatch.pro @@ -29,7 +29,7 @@ SOURCES += \ watchletplugininterface.cpp \ registry.cpp -HEADERS +=\ +HEADERS += \ watchsimulator.h \ watchserver.h \ watchpaintengine.h \ @@ -62,10 +62,10 @@ symbian { unix:!symbian { install_headers.path = /usr/include/sowatch - maemo5 { - target.path = /opt/maemo/usr/lib - } else { - target.path = /usr/lib - } + !isEmpty(MEEGO_VERSION_MAJOR)|maemo5 { + target.path = /opt/sowatch/lib + } else { + target.path = /usr/lib + } INSTALLS += install_headers target } diff --git a/libsowatch/sowatch_global.h b/libsowatch/sowatch_global.h index 1afa590..c317ba4 100644 --- a/libsowatch/sowatch_global.h +++ b/libsowatch/sowatch_global.h @@ -2,17 +2,20 @@ #define SOWATCH_GLOBAL_H #include <QtCore/qglobal.h> +#include <qplatformdefs.h> #if defined(SOWATCH_LIBRARY) -# define SOWATCH_EXPORT Q_DECL_EXPORT +# define SOWATCH_EXPORT Q_DECL_EXPORT #else -# define SOWATCH_EXPORT Q_DECL_IMPORT +# define SOWATCH_EXPORT Q_DECL_IMPORT #endif -#if defined(Q_WS_MAEMO_5) -# define SOWATCH_PLUGINS_DIR "/opt/sowatch" +#if defined(MEEGO_VERSION_MAJOR) || defined(Q_WS_MAEMO_5) +# define SOWATCH_PLUGINS_DIR "/opt/sowatch/lib" #elif defined(Q_OS_LINUX) -# define SOWATCH_PLUGINS_DIR "/usr/lib/sowatch" +# define SOWATCH_PLUGINS_DIR "/usr/lib/sowatch" +#else +# error Please define a path for your platform #endif #define SOWATCH_DRIVERS_DIR SOWATCH_PLUGINS_DIR "/drivers" |