Skip to content

[ios][4.3-beta] expose explict module for c & cpp #2906

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 4.3-beta
Choose a base branch
from
Open

[ios][4.3-beta] expose explict module for c & cpp #2906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,8 @@ let package = Package(
name: "SpineC",
path: "spine-ios/Sources/SpineC",
sources: [
"spine-c/src/extensions.cpp",
"spine-c/src/generated",
"spine-cpp/src/spine",
],
publicHeadersPath: "spine-c/include",
cxxSettings: [
.headerSearchPath("spine-c/include"),
.headerSearchPath("spine-c/src"),
.headerSearchPath("spine-c/src/generated"),
.headerSearchPath("spine-cpp/include"),
.headerSearchPath("spine-cpp/src"),
"src",
"spine"
],
linkerSettings: [
.linkedLibrary("c++")
Expand Down
15 changes: 12 additions & 3 deletions spine-c/include/module.modulemap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
module SpineC {
header "spine-c.h"
export *
}
use c
export c
explicit module cpp {
umbrella header "spine/spine.h"
requires cplusplus11
export *
}
explicit module c {
header "spine-c.h"
export *
}
}
1 change: 1 addition & 0 deletions spine-ios/Sources/SpineC/include/module.modulemap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../../spine-c/include/module.modulemap
1 change: 1 addition & 0 deletions spine-ios/Sources/SpineC/include/spine
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../../spine-cpp/include/spine
1 change: 1 addition & 0 deletions spine-ios/Sources/SpineC/include/spine-c.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../../spine-c/include/spine-c.h
1 change: 1 addition & 0 deletions spine-ios/Sources/SpineC/spine
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../spine-cpp/src/spine
1 change: 0 additions & 1 deletion spine-ios/Sources/SpineC/spine-c
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion spine-ios/Sources/SpineC/spine-cpp
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions spine-ios/Sources/SpineC/src
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../spine-c/src