From 9c52aaf043753dbb594c7420f776c836215dd6d2 Mon Sep 17 00:00:00 2001 From: jan Iversen Date: Sat, 14 Dec 2019 21:56:31 +0100 Subject: build-system: move exportfuncs to backend-shared WARNING: multi directory commit, needed to secure it builds. move the core/exportfuncs.* to backend-shared. update backend-shared/CMakeLists.txt to generate backend-shared lib update CMakeLists.txt to include backend-shared lib in link process. update ios project to reflect new directory Signed-off-by: Jan Iversen --- packaging/ios/Subsurface-mobile.pro | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packaging/ios') 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 \ -- cgit v1.2.3-70-g09d2