mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2025-06-16 05:55:20 +00:00
Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios
This commit is contained in:
commit
5e84216346
@ -15,13 +15,16 @@ let package = Package(
|
||||
dependencies: [
|
||||
// Dependencies declare other packages that this package depends on.
|
||||
// .package(url: /* package url */, from: "1.0.0"),
|
||||
.package(name: "SSignalKit", path: "../../submodules/telegram-ios/submodules/SSignalKit"),
|
||||
],
|
||||
targets: [
|
||||
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
|
||||
// Targets can depend on other targets in this package, and on products in packages this package depends on.
|
||||
.target(
|
||||
name: "ManagedFile",
|
||||
dependencies: [],
|
||||
dependencies: [
|
||||
.product(name: "SwiftSignalKit", package: "SSignalKit", condition: nil),
|
||||
],
|
||||
path: ".",
|
||||
exclude: ["BUILD"]),
|
||||
]
|
||||
|
@ -14,6 +14,8 @@ optimization_flags = select({
|
||||
"//conditions:default": ["-DNDEBUG"],
|
||||
})
|
||||
|
||||
enable_x264 = False
|
||||
|
||||
objc_library(
|
||||
name = "TgVoipWebrtc",
|
||||
enable_modules = True,
|
||||
@ -70,7 +72,7 @@ objc_library(
|
||||
"-DRTC_ENABLE_VP9",
|
||||
"-DTGVOIP_NAMESPACE=tgvoip_webrtc",
|
||||
"-std=c++14",
|
||||
] + optimization_flags,
|
||||
] + optimization_flags + (["-DTGCALLS_ENABLE_X264"] if enable_x264 else []),
|
||||
includes = [
|
||||
"PublicHeaders",
|
||||
],
|
||||
@ -84,8 +86,7 @@ objc_library(
|
||||
"//submodules/ffmpeg:ffmpeg",
|
||||
"//third-party/rnnoise:rnnoise",
|
||||
"//third-party/libyuv:libyuv",
|
||||
"//third-party/libx264:libx264",
|
||||
],
|
||||
] + (["//third-party/libx264:libx264"] if enable_x264 else []),
|
||||
sdk_frameworks = [
|
||||
"Foundation",
|
||||
"UIKit",
|
||||
|
@ -1 +1 @@
|
||||
Subproject commit 382d1b6756768021274cb1edfc1e144cfb101fb8
|
||||
Subproject commit 7214d1df903dfcfb58a78858414d5724cfae5578
|
@ -1,5 +1,5 @@
|
||||
{
|
||||
"app": "8.5.1",
|
||||
"app": "8.6",
|
||||
"bazel": "5.0.0",
|
||||
"xcode": "13.2.1"
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user