From 9c559dcb488754163b70ce9ff3a18ce6066831c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Haibo=20Chen=28=E9=99=88=E6=B5=B7=E5=8D=9A=29?= <495810242@qq.com> Date: Thu, 29 May 2025 20:44:44 +0800 Subject: [PATCH] VSCode: Support GDB on Linux and LLDB on macOS. v7.0.35 (#4362) Co-authored-by: winlin --- .vscode/launch.json | 7 ++++++- trunk/doc/CHANGELOG.md | 1 + trunk/src/core/srs_core_version7.hpp | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 047efcbfd..f66d3e5f9 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -11,7 +11,12 @@ "cwd": "${workspaceFolder}/trunk", "environment": [], "externalConsole": false, - "MIMode": "lldb", + "linux": { + "MIMode": "gdb" + }, + "osx": { + "MIMode": "lldb" + }, "setupCommands": [ { "description": "Enable pretty-printing for gdb", diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md index 556e78acc..7f5240b79 100644 --- a/trunk/doc/CHANGELOG.md +++ b/trunk/doc/CHANGELOG.md @@ -7,6 +7,7 @@ The changelog for SRS. ## SRS 7.0 Changelog +* v7.0, 2025-05-29, Merge [#4362](https://github.com/ossrs/srs/pull/4362): Update VSCode launch configuration to support GDB on Linux and LLDB on macOS. v7.0.35 (#4362) * v7.0, 2025-05-26, Merge [#4359](https://github.com/ossrs/srs/pull/4359): update pion/webrtc to v4. v7.0.34 (#4359) * v7.0, 2025-05-13, Merge [#4289](https://github.com/ossrs/srs/pull/4289): rtmp2rtc: Support RTMP-to-WebRTC conversion with HEVC. v7.0.33 (#4289) * v7.0, 2025-04-30, Merge [#4308](https://github.com/ossrs/srs/pull/4308): Fix memory leaks from errors skipping resource release. v7.0.32 (#4308) diff --git a/trunk/src/core/srs_core_version7.hpp b/trunk/src/core/srs_core_version7.hpp index aadc2f8e5..fae79f416 100644 --- a/trunk/src/core/srs_core_version7.hpp +++ b/trunk/src/core/srs_core_version7.hpp @@ -9,6 +9,6 @@ #define VERSION_MAJOR 7 #define VERSION_MINOR 0 -#define VERSION_REVISION 34 +#define VERSION_REVISION 35 #endif \ No newline at end of file