diff options
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | qt-models/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | qt-models/maplocationmodel.cpp | 6 |
3 files changed, 9 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d48617afa..18428778f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -393,6 +393,9 @@ elseif (SUBSURFACE_TARGET_EXECUTABLE MATCHES "DownloaderExecutable") add_executable(${SUBSURFACE_TARGET} MACOSX_BUNDLE WIN32 ${SUBSURFACE_PKG} ${DOWNLOADER_APP} ${SUBSURFACE_RESOURCES}) target_link_libraries( ${SUBSURFACE_TARGET} + subsurface_backend_shared + subsurface_models_downloader + subsurface_commands subsurface_corelib ${SUBSURFACE_LINK_LIBRARIES} ) diff --git a/qt-models/CMakeLists.txt b/qt-models/CMakeLists.txt index b42b6063b..dc115c554 100644 --- a/qt-models/CMakeLists.txt +++ b/qt-models/CMakeLists.txt @@ -73,4 +73,7 @@ elseif (SUBSURFACE_TARGET_EXECUTABLE MATCHES "MobileExecutable") add_library(subsurface_models_mobile STATIC ${SUBSURFACE_GENERIC_MODELS_LIB_SRCS} ${SUBSURFACE_MOBILE_MODELS_LIB_SRCS}) target_link_libraries(subsurface_models_mobile ${QT_LIBRARIES}) +elseif (SUBSURFACE_TARGET_EXECUTABLE MATCHES "DownloaderExecutable") + add_library(subsurface_models_downloader STATIC ${SUBSURFACE_GENERIC_MODELS_LIB_SRCS}) + target_link_libraries(subsurface_models_downloader ${QT_LIBRARIES}) endif() diff --git a/qt-models/maplocationmodel.cpp b/qt-models/maplocationmodel.cpp index c123b19c5..b92d1385e 100644 --- a/qt-models/maplocationmodel.cpp +++ b/qt-models/maplocationmodel.cpp @@ -3,7 +3,7 @@ #include "divelocationmodel.h" #include "core/divesite.h" #include "core/divefilter.h" -#ifndef SUBSURFACE_MOBILE +#if !defined(SUBSURFACE_MOBILE) && !defined(SUBSURFACE_DOWNLOADER) #include "qt-models/filtermodels.h" #include "desktop-widgets/mapwidget.h" #endif @@ -20,7 +20,7 @@ MapLocation::MapLocation(struct dive_site *dsIn, QGeoCoordinate coordIn, QString // Simplify this! static bool inEditMode() { -#ifdef SUBSURFACE_MOBILE +#if defined(SUBSURFACE_MOBILE) || defined(SUBSURFACE_DOWNLOADER) return false; #else return MapWidget::instance()->editMode(); @@ -127,7 +127,7 @@ void MapLocationModel::reload(QObject *map) QMap<QString, MapLocation *> locationNameMap; -#ifdef SUBSURFACE_MOBILE +#if defined(SUBSURFACE_MOBILE) || defined(SUBSURFACE_DOWNLOADER) bool diveSiteMode = false; #else // In dive site mode (that is when either editing a dive site or on |