diff --git a/CZlib/empty.c b/CZlib/empty.c new file mode 100644 index 00000000..6ce22d32 --- /dev/null +++ b/CZlib/empty.c @@ -0,0 +1 @@ +// empty file for compiler diff --git a/CZlib/include/c_zlib.h b/CZlib/include/c_zlib.h new file mode 100644 index 00000000..06ccad89 --- /dev/null +++ b/CZlib/include/c_zlib.h @@ -0,0 +1,7 @@ +#ifndef C_ZLIB_H +#define C_ZLIB_H + +#include +#include + +#endif diff --git a/Package.resolved b/Package.resolved deleted file mode 100644 index e49c8be4..00000000 --- a/Package.resolved +++ /dev/null @@ -1,16 +0,0 @@ -{ - "object": { - "pins": [ - { - "package": "swift-nio-zlib-support", - "repositoryURL": "https://github.com/apple/swift-nio-zlib-support.git", - "state": { - "branch": null, - "revision": "37760e9a52030bb9011972c5213c3350fa9d41fd", - "version": "1.0.0" - } - } - ] - }, - "version": 1 -} diff --git a/Package.swift b/Package.swift index f45b4cbd..85e4fb6c 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.2 +// swift-tools-version:5.1 // // Package.Swift @@ -29,11 +29,13 @@ let package = Package( ], dependencies: [], targets: [ - .target(name: "Starscream", - path: "Sources") + .target( + name: "Starscream", + dependencies: ["CZlib"], + path: "Sources"), + .target( + name: "CZlib", + path: "CZlib", + linkerSettings: [ .linkedLibrary("z") ]) ] ) - -#if os(Linux) - package.dependencies.append(.package(url: "https://github.com/apple/swift-nio-zlib-support.git", from: "1.0.0")) -#endif diff --git a/Sources/Compression/WSCompression.swift b/Sources/Compression/WSCompression.swift index 21295841..1cbc6c84 100644 --- a/Sources/Compression/WSCompression.swift +++ b/Sources/Compression/WSCompression.swift @@ -27,7 +27,7 @@ ////////////////////////////////////////////////////////////////////////////////////////////////// import Foundation -import zlib +import CZlib public class WSCompression: CompressionHandler { let headerWSExtensionName = "Sec-WebSocket-Extensions"