pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[ios] enable swift/cpp interop

Browse source 
Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
This commit is contained in:
Kiryl Kaveryn 2025-01-04 14:04:10 +04:00
parent ec072a188c
commit d52ddd77f9
5 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj
View file

@ -696,6 +696,7 @@
);
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
SWIFT_OBJC_INTEROP_MODE = objcxx;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
@ -718,6 +719,7 @@
"$(OMIM_ROOT)/3party/pugixml/pugixml/src",
);
SDKROOT = iphoneos;
SWIFT_OBJC_INTEROP_MODE = objcxx;
VALIDATE_PRODUCT = YES;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";

2
iphone/Maps/Maps.xcodeproj/project.pbxproj
View file

@ -5091,6 +5091,7 @@
OTHER_SWIFT_FLAGS = "$(inherited)";
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps.debug;
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_INTEROP_MODE = objcxx;
};
name = Debug;
};
@ -5113,6 +5114,7 @@
OTHER_SWIFT_FLAGS = "$(inherited)";
PRODUCT_BUNDLE_IDENTIFIER = app.organicmaps;
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_INTEROP_MODE = objcxx;
};
name = Release;
};

10
map/module.modulemap Normal file
View file

@ -0,0 +1,10 @@
module map {
// header "framework.hpp"
// header "bookmark_manager.hpp"
header "bookmark.hpp"
header "track.hpp"
header "elevation_info.hpp"
header "gps_track_collection.hpp"
export *
}

2
xcode/common.xcconfig
View file

@ -94,7 +94,7 @@ MTL_FAST_MATH = YES
ONLY_ACTIVE_ARCH = YES
PRODUCT_NAME = $(TARGET_NAME)
SKIP_INSTALL = YES
SWIFT_VERSION = 5.5
SWIFT_VERSION = 5.9
TARGETED_DEVICE_FAMILY = 1,2
VALID_ARCHS = arm64
VALID_ARCHS[sdk=iphonesimulator*] = x86_64 arm64

4
xcode/map/map.xcodeproj/project.pbxproj
View file

@ -240,6 +240,7 @@
BBFC7E38202D29BF00531BE7 /* user_mark_layer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = user_mark_layer.cpp; sourceTree = "<group>"; };
BBFC7E39202D29BF00531BE7 /* user_mark_layer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = user_mark_layer.hpp; sourceTree = "<group>"; };
ED49D74B2CEF3CE3004AF27E /* elevation_info_tests.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = elevation_info_tests.cpp; sourceTree = "<group>"; };
ED79CAC32D28259F00E63864 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
F6B282FB1C1B03320081957A /* gps_track_collection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gps_track_collection.cpp; sourceTree = "<group>"; };
F6B282FC1C1B03320081957A /* gps_track_collection.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = gps_track_collection.hpp; sourceTree = "<group>"; };
F6B282FD1C1B03320081957A /* gps_track_filter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gps_track_filter.cpp; sourceTree = "<group>"; };
@ -456,6 +457,7 @@
3DA5722F20C195EC007BDE27 /* viewport_search_callback.cpp */,
3DA5722C20C195EC007BDE27 /* viewport_search_callback.hpp */,
3D4E99811FB462B60025B48C /* viewport_search_params.hpp */,
ED79CAC32D28259F00E63864 /* module.modulemap */,
);
name = map;
path = ../../map;
@ -788,6 +790,7 @@
675345C71A4054AD00A0A8C3 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
DEFINES_MODULE = YES;
EXECUTABLE_PREFIX = lib;
PRODUCT_NAME = "$(TARGET_NAME)";
WARNING_CFLAGS = "-Wno-deprecated-register ";
@ -797,6 +800,7 @@
675345C81A4054AD00A0A8C3 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
DEFINES_MODULE = YES;
EXECUTABLE_PREFIX = lib;
PRODUCT_NAME = "$(TARGET_NAME)";
WARNING_CFLAGS = "-Wno-deprecated-register ";