Skip to content

Commit 4a3b09c

Browse files
authored
Merge pull request BradLarson#133 from BradLarson/swiftpm
Convert project to use Swift Package Manager by default
2 parents d703ea5 + d7bc857 commit 4a3b09c

File tree

227 files changed

+370
-2584
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

227 files changed

+370
-2584
lines changed

Package.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
// swift-tools-version:5.0
1+
// swift-tools-version:5.5
22

33
import PackageDescription
44

55
let package = Package(
66
name: "GPUImage",
77
platforms: [
8-
.macOS(.v10_11), .iOS(.v9),
8+
.macOS(.v10_11), .iOS(.v10),
99
],
1010
products: [
1111
.library(
@@ -16,7 +16,7 @@ let package = Package(
1616
targets: [
1717
.target(
1818
name: "GPUImage",
19-
path: "framework/Source",
20-
exclude: ["Linux", "Operations/Shaders"])],
21-
swiftLanguageVersions: [.v4_2]
19+
resources: [.process("Resources")]
20+
)
21+
]
2222
)

README.md

Lines changed: 7 additions & 7 deletions

framework/Source/MetalRenderingDevice.swift renamed to Sources/GPUImage/MetalRenderingDevice.swift

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,10 @@ public class MetalRenderingDevice {
3636
self.metalPerformanceShadersAreSupported = false
3737
}
3838

39-
do {
40-
let frameworkBundle = Bundle(for: MetalRenderingDevice.self)
41-
let metalLibraryPath = frameworkBundle.path(forResource: "default", ofType: "metallib")!
42-
43-
self.shaderLibrary = try device.makeLibrary(filepath:metalLibraryPath)
44-
} catch {
39+
guard let defaultLibrary = try? device.makeDefaultLibrary(bundle: Bundle.module) else {
4540
fatalError("Could not load library")
4641
}
42+
43+
self.shaderLibrary = defaultLibrary
4744
}
4845
}

0 commit comments

Comments
 (0)