From 44f6809daf5c008a580d395d366c8be878d4bb78 Mon Sep 17 00:00:00 2001 From: Mikhail Filimonov Date: Mon, 30 Sep 2024 23:31:36 +0400 Subject: [PATCH 1/3] macos spm related changes --- .gitignore | 3 +++ submodules/FFMpegBinding/Package.swift | 2 +- submodules/OpusBinding/Package.swift | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a0d74e1226..321f0991f6 100644 --- a/.gitignore +++ b/.gitignore @@ -65,3 +65,6 @@ xcodeproj.bazelrc build-input/* **/*.pyc *.pyc +submodules/OpusBinding/SharedHeaders/* +submodules/FFMpegBinding/SharedHeaders/* + diff --git a/submodules/FFMpegBinding/Package.swift b/submodules/FFMpegBinding/Package.swift index da926bdafc..6d794a2920 100644 --- a/submodules/FFMpegBinding/Package.swift +++ b/submodules/FFMpegBinding/Package.swift @@ -27,7 +27,7 @@ let package = Package( publicHeadersPath: "Public", cSettings: [ .headerSearchPath("Public"), - .unsafeFlags(["-I../../../../core-xprojects/ffmpeg/build/ffmpeg/include"]) + .headerSearchPath("SharedHeaders/ffmpeg/include"), ]), ] ) diff --git a/submodules/OpusBinding/Package.swift b/submodules/OpusBinding/Package.swift index 12028015a3..b4c267b00e 100644 --- a/submodules/OpusBinding/Package.swift +++ b/submodules/OpusBinding/Package.swift @@ -28,8 +28,8 @@ let package = Package( cSettings: [ .headerSearchPath("PublicHeaders"), .headerSearchPath("PublicHeaders/OpusBinding"), + .headerSearchPath("SharedHeades/libopus/include"), .headerSearchPath("Sources"), - .unsafeFlags(["-I../../../../core-xprojects/libopus/build/libopus/include"]) ]), ] ) From 5f7e8480861dd7fa8d5763cf2a75b202643b5ed9 Mon Sep 17 00:00:00 2001 From: Mikhail Filimonov Date: Tue, 1 Oct 2024 02:01:12 +0400 Subject: [PATCH 2/3] spm changes --- submodules/OpenSSLEncryptionProvider/Package.swift | 6 ++---- submodules/OpusBinding/Package.swift | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/submodules/OpenSSLEncryptionProvider/Package.swift b/submodules/OpenSSLEncryptionProvider/Package.swift index 1fd1668319..a8c920d7c8 100644 --- a/submodules/OpenSSLEncryptionProvider/Package.swift +++ b/submodules/OpenSSLEncryptionProvider/Package.swift @@ -23,10 +23,8 @@ let package = Package( publicHeadersPath: "PublicHeaders", cSettings: [ .headerSearchPath("PublicHeaders"), - .unsafeFlags([ - "-I../../../../core-xprojects/openssl/build/openssl/include", - "-I../EncryptionProvider/PublicHeaders" - ]) + .headerSearchPath("SharedHeaders/openssl/include"), + .headerSearchPath("SharedHeaders/EncryptionProvider"), ]), ] ) diff --git a/submodules/OpusBinding/Package.swift b/submodules/OpusBinding/Package.swift index 12028015a3..045c0e30c3 100644 --- a/submodules/OpusBinding/Package.swift +++ b/submodules/OpusBinding/Package.swift @@ -28,8 +28,8 @@ let package = Package( cSettings: [ .headerSearchPath("PublicHeaders"), .headerSearchPath("PublicHeaders/OpusBinding"), + .headerSearchPath("SharedHeaders/libopus/include"), .headerSearchPath("Sources"), - .unsafeFlags(["-I../../../../core-xprojects/libopus/build/libopus/include"]) ]), ] ) From 73f2f81e56c76c2b58d4add11d11e7af8b21b376 Mon Sep 17 00:00:00 2001 From: Mikhail Filimonov Date: Tue, 1 Oct 2024 02:18:18 +0400 Subject: [PATCH 3/3] spm changes --- .gitignore | 1 + submodules/OpusBinding/Package.swift | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 321f0991f6..3603100d4a 100644 --- a/.gitignore +++ b/.gitignore @@ -67,4 +67,5 @@ build-input/* *.pyc submodules/OpusBinding/SharedHeaders/* submodules/FFMpegBinding/SharedHeaders/* +submodules/OpenSSLEncryptionProvider/SharedHeaders/* diff --git a/submodules/OpusBinding/Package.swift b/submodules/OpusBinding/Package.swift index b4c267b00e..045c0e30c3 100644 --- a/submodules/OpusBinding/Package.swift +++ b/submodules/OpusBinding/Package.swift @@ -28,7 +28,7 @@ let package = Package( cSettings: [ .headerSearchPath("PublicHeaders"), .headerSearchPath("PublicHeaders/OpusBinding"), - .headerSearchPath("SharedHeades/libopus/include"), + .headerSearchPath("SharedHeaders/libopus/include"), .headerSearchPath("Sources"), ]), ]