Move all source files to `Sources/` and rename WireGuardKit targets

Signed-off-by: Andrej Mihajlov <and@mullvad.net>
This commit is contained in:
Andrej Mihajlov 2020-12-02 12:27:39 +01:00
parent 9c38a1b897
commit ec57408570
209 changed files with 54 additions and 58 deletions

View File

@ -10,24 +10,21 @@ let package = Package(
.iOS(.v12) .iOS(.v12)
], ],
products: [ products: [
.library(name: "WireGuardKit", targets: ["WireGuardKit"]) .library(name: "WireGuardKit", targets: ["WireGuardKitSwift"])
], ],
dependencies: [], dependencies: [],
targets: [ targets: [
.target( .target(
name: "WireGuardKit", name: "WireGuardKitSwift",
dependencies: ["libwg-go", "WireGuardKitCTarget"], dependencies: ["WireGuardKitGo", "WireGuardKitC"]
path: "WireGuardKit/Sources/WireGuardKit"
), ),
.target( .target(
name: "WireGuardKitCTarget", name: "WireGuardKitC",
dependencies: [], dependencies: []
path: "WireGuardKit/Sources/WireGuardKitCTarget"
), ),
.target( .target(
name: "libwg-go", name: "WireGuardKitGo",
dependencies: [], dependencies: [],
path: "WireGuardKit/Sources/libwg-go",
linkerSettings: [.linkedLibrary("wg-go")] linkerSettings: [.linkedLibrary("wg-go")]
) )
] ]

View File

@ -54,7 +54,7 @@ $ open ./WireGuard/WireGuard.xcodeproj
the "External Build Tool Configuration": the "External Build Tool Configuration":
``` ```
$BUILD_DIR/../../SourcePackages/checkouts/wireguard-apple/wireguard-go-bridge $BUILD_DIR/../../SourcePackages/checkouts/Sources/WireGuardGo
``` ```
- Switch to "Build Settings" and find `SDKROOT`. - Switch to "Build Settings" and find `SDKROOT`.

Some files were not shown because too many files have changed in this diff Show More