drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2026-01-07 13:03:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ios] Allowed to use C++ editor methods directly from Swift

Browse Source 
Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
This commit is contained in:
Yannik Bloscheck
2025-07-03 20:41:05 +02:00
committed by Konstantin Pastbin
parent 13ba20aa25
commit ef9618b3d6
6 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
iphone/Maps/Classes/CustomAlert/MWMOsmAuthAlert.mm
View File

@@ -1,6 +1,7 @@
#import "MWMAlertViewController.h"
#import "MWMOsmAuthAlert.h"
#include <string>
#include "editor/osm_auth.hpp"
static NSString * const kMap2OsmLoginSegue = @"Map2OsmLogin";

1
iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationCommon.h
View File

@@ -1,3 +1,4 @@
#include <string>
#include "editor/osm_auth.hpp"
namespace osm_auth_ios

2
iphone/Maps/Core/Editor/MWMEditorHelper.mm
View File

@@ -2,6 +2,8 @@
#import <CoreApi/AppInfo.h>
#import "MWMAuthorizationCommon.h"
#include <string>
#include <map>
#include "editor/osm_editor.hpp"
@implementation MWMEditorHelper

10
iphone/Maps/Maps.xcodeproj/project.pbxproj
View File

@@ -5235,6 +5235,8 @@
OTHER_SWIFT_FLAGS = "$(inherited)";
PRODUCT_BUNDLE_IDENTIFIER = app.comaps.debug;
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_INCLUDE_PATHS = "$(OMIM_ROOT)/editor";
SWIFT_OBJC_INTEROP_MODE = objcxx;
};
name = Debug;
};
@@ -5268,6 +5270,8 @@
OTHER_SWIFT_FLAGS = "$(inherited)";
PRODUCT_BUNDLE_IDENTIFIER = app.comaps;
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_INCLUDE_PATHS = "$(OMIM_ROOT)/editor";
SWIFT_OBJC_INTEROP_MODE = objcxx;
};
name = Release;
};
@@ -5391,12 +5395,13 @@
"$(OTHER_CFLAGS)",
"-fcxx-modules",
);
OTHER_SWIFT_FLAGS = "$(inherited)";
OTHER_SWIFT_FLAGS = "$(inherited) -cxx-interoperability-mode=default";
PRODUCT_BUNDLE_IDENTIFIER = "${BUNDLE_IDENTIFIER}";
PRODUCT_NAME = "CoMaps (Debug)";
SDKROOT = iphoneos;
SKIP_INSTALL = NO;
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
SWIFT_INCLUDE_PATHS = "$(OMIM_ROOT)/editor";
SWIFT_OBJC_BRIDGING_HEADER = "Bridging-Header.h";
SWIFT_OBJC_INTERFACE_HEADER_NAME = SwiftBridge.h;
SWIFT_PRECOMPILE_BRIDGING_HEADER = NO;
@@ -5431,12 +5436,13 @@
"$(OTHER_CFLAGS)",
"-fcxx-modules",
);
OTHER_SWIFT_FLAGS = "$(inherited)";
OTHER_SWIFT_FLAGS = "$(inherited) -cxx-interoperability-mode=default";
PRODUCT_BUNDLE_IDENTIFIER = "${BUNDLE_IDENTIFIER}";
PRODUCT_NAME = CoMaps;
SDKROOT = iphoneos;
SKIP_INSTALL = NO;
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
SWIFT_INCLUDE_PATHS = "$(OMIM_ROOT)/editor";
SWIFT_OBJC_BRIDGING_HEADER = "Bridging-Header.h";
SWIFT_OBJC_INTERFACE_HEADER_NAME = SwiftBridge.h;
SWIFT_PRECOMPILE_BRIDGING_HEADER = NO;