aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrej Mihajlov <and@mullvad.net>2020-12-02 13:02:36 +0100
committerAndrej Mihajlov <and@mullvad.net>2020-12-03 13:32:24 +0100
commitfd527f73e6d4b6968a793b1853318cb30eb2a7e3 (patch)
tree7a68d9ac62d6bb5c386e4eac8198f73704ef6b46
parentWireGuardKit: Fix module map for WireGuardKitC (diff)
downloadwireguard-apple-fd527f73e6d4b6968a793b1853318cb30eb2a7e3.tar.xz
wireguard-apple-fd527f73e6d4b6968a793b1853318cb30eb2a7e3.zip
WireGuardKit: Set publicHeadersPath = "." to flatten public headers structure
Signed-off-by: Andrej Mihajlov <and@mullvad.net>
-rw-r--r--Package.swift4
-rw-r--r--Sources/WireGuardKitC/WireGuardKitC.h (renamed from Sources/WireGuardKitC/include/WireGuardKitCTarget.h)4
-rw-r--r--Sources/WireGuardKitC/module.modulemap2
3 files changed, 6 insertions, 4 deletions
diff --git a/Package.swift b/Package.swift
index 7b04c87..b414377 100644
--- a/Package.swift
+++ b/Package.swift
@@ -20,11 +20,13 @@ let package = Package(
),
.target(
name: "WireGuardKitC",
- dependencies: []
+ dependencies: [],
+ publicHeadersPath: "."
),
.target(
name: "WireGuardKitGo",
dependencies: [],
+ publicHeadersPath: ".",
linkerSettings: [.linkedLibrary("wg-go")]
)
]
diff --git a/Sources/WireGuardKitC/include/WireGuardKitCTarget.h b/Sources/WireGuardKitC/WireGuardKitC.h
index 30a24e4..83ff67d 100644
--- a/Sources/WireGuardKitC/include/WireGuardKitCTarget.h
+++ b/Sources/WireGuardKitC/WireGuardKitC.h
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
// Copyright © 2018-2019 WireGuard LLC. All Rights Reserved.
-#include "../key.h"
-#include "../x25519.h"
+#include "key.h"
+#include "x25519.h"
diff --git a/Sources/WireGuardKitC/module.modulemap b/Sources/WireGuardKitC/module.modulemap
index 606e470..26b45bf 100644
--- a/Sources/WireGuardKitC/module.modulemap
+++ b/Sources/WireGuardKitC/module.modulemap
@@ -1,4 +1,4 @@
module WireGuardKitC {
- umbrella header "include/WireGuardKitCTarget.h"
+ umbrella header "WireGuardKitC.h"
export *
}