diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | backend-shared/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | backend-shared/exportfuncs.cpp (renamed from core/exportfuncs.cpp) | 0 | ||||
| -rw-r--r-- | backend-shared/exportfuncs.h (renamed from core/exportfuncs.h) | 0 | ||||
| -rw-r--r-- | core/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | desktop-widgets/divelogexportdialog.cpp | 2 | ||||
| -rw-r--r-- | mobile-widgets/qmlmanager.cpp | 2 | ||||
| -rw-r--r-- | packaging/ios/Subsurface-mobile.pro | 4 |
8 files changed, 13 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 55589f830..f032c6c45 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -312,6 +312,7 @@ if (SUBSURFACE_TARGET_EXECUTABLE MATCHES "MobileExecutable") subsurface_mobile subsurface_profile subsurface_mapwidget + subsurface_backend_shared subsurface_models_mobile subsurface_corelib ${SUBSURFACE_LINK_LIBRARIES} @@ -335,6 +336,7 @@ elseif (SUBSURFACE_TARGET_EXECUTABLE MATCHES "DesktopExecutable") subsurface_profile subsurface_statistics subsurface_mapwidget + subsurface_backend_shared subsurface_models_desktop subsurface_commands_desktop subsurface_corelib diff --git a/backend-shared/CMakeLists.txt b/backend-shared/CMakeLists.txt index 750d22a98..b6502bfdf 100644 --- a/backend-shared/CMakeLists.txt +++ b/backend-shared/CMakeLists.txt @@ -1,2 +1,9 @@ # backend functionality shared between Desktop (UI) and Mobile (QML) +set(BACKEND_SRCS + exportfuncs.cpp + exportfuncs.h +) + +add_library(subsurface_backend_shared STATIC ${BACKEND_SRCS}) +target_link_libraries(subsurface_backend_shared ${QT_LIBRARIES}) diff --git a/core/exportfuncs.cpp b/backend-shared/exportfuncs.cpp index 839c0bf1d..839c0bf1d 100644 --- a/core/exportfuncs.cpp +++ b/backend-shared/exportfuncs.cpp diff --git a/core/exportfuncs.h b/backend-shared/exportfuncs.h index a378e152d..a378e152d 100644 --- a/core/exportfuncs.h +++ b/backend-shared/exportfuncs.h diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 376cfda4f..017fbdeea 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -86,8 +86,6 @@ set(SUBSURFACE_CORE_LIB_SRCS errorhelper.c exif.cpp exif.h - exportfuncs.cpp - exportfuncs.h file.c file.h format.cpp diff --git a/desktop-widgets/divelogexportdialog.cpp b/desktop-widgets/divelogexportdialog.cpp index 2ba837de9..dc0928e8f 100644 --- a/desktop-widgets/divelogexportdialog.cpp +++ b/desktop-widgets/divelogexportdialog.cpp @@ -15,7 +15,7 @@ #include "core/errorhelper.h" #include "core/file.h" #include "core/tag.h" -#include "core/exportfuncs.h" +#include "backend-shared/exportfuncs.h" #include "desktop-widgets/mainwindow.h" #include "desktop-widgets/divelogexportdialog.h" #include "desktop-widgets/diveshareexportdialog.h" diff --git a/mobile-widgets/qmlmanager.cpp b/mobile-widgets/qmlmanager.cpp index ca8d82f13..f58fa7d83 100644 --- a/mobile-widgets/qmlmanager.cpp +++ b/mobile-widgets/qmlmanager.cpp @@ -45,7 +45,7 @@ #include "core/settings/qPrefPartialPressureGas.h" #include "core/settings/qPrefUnit.h" #include "core/trip.h" -#include "core/exportfuncs.h" +#include "backend-shared/exportfuncs.h" #include "core/worldmap-save.h" #include "core/uploadDiveLogsDE.h" #include "core/uploadDiveShare.h" diff --git a/packaging/ios/Subsurface-mobile.pro b/packaging/ios/Subsurface-mobile.pro index af265488d..97c939275 100644 --- a/packaging/ios/Subsurface-mobile.pro +++ b/packaging/ios/Subsurface-mobile.pro @@ -31,7 +31,6 @@ SOURCES += ../../subsurface-mobile-main.cpp \ ../../core/divesitehelpers.cpp \ ../../core/errorhelper.c \ ../../core/exif.cpp \ - ../../core/exportfuncs.cpp \ ../../core/format.cpp \ ../../core/gettextfromc.cpp \ ../../core/metrics.cpp \ @@ -107,6 +106,7 @@ SOURCES += ../../subsurface-mobile-main.cpp \ ../../core/subsurface-qt/CylinderObjectHelper.cpp \ ../../core/subsurface-qt/DiveObjectHelper.cpp \ ../../core/subsurface-qt/DiveListNotifier.cpp \ + ../../backend-shared/exportfuncs.cpp \ ../../mobile-widgets/qmlmanager.cpp \ ../../mobile-widgets/qmlprefs.cpp \ ../../qt-models/divelistmodel.cpp \ @@ -186,7 +186,6 @@ HEADERS += \ ../../core/divelogexportlogic.h \ ../../core/divesitehelpers.h \ ../../core/exif.h \ - ../../core/exportfuncs.h \ ../../core/file.h \ ../../core/gaspressures.h \ ../../core/gettext.h \ @@ -232,6 +231,7 @@ HEADERS += \ ../../core/subsurface-qt/CylinderObjectHelper.h \ ../../core/subsurface-qt/DiveObjectHelper.h \ ../../core/subsurface-qt/DiveListNotifier.h \ + ../../backend-shared/exportfuncs.h \ ../../mobile-widgets/qmlmanager.h \ ../../mobile-widgets/qmlprefs.h \ ../../map-widget/qmlmapwidgethelper.h \ |