-
-
Notifications
You must be signed in to change notification settings - Fork 5.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'ossrs:develop' into develop
- Loading branch information
Showing
871 changed files
with
21,312 additions
and
7,317 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| # Debug with VSCode | ||
|
|
||
| Support run and debug with VSCode. | ||
|
|
||
| ## SRS | ||
|
|
||
| Install the following extensions: | ||
|
|
||
| - CMake Tools | ||
| - CodeLLDB | ||
| - C/C++ Extension Pack | ||
|
|
||
| Open the folder like `~/git/srs` in VSCode. | ||
| Run commmand `> CMake: Configure` to configure the project. | ||
|
|
||
| > Note: You can press `Ctrl+R`, then type `CMake: Configure` then select `Clang` as the toolchain. | ||
| > Note: The `settings.json` is used to configure the cmake. It will use `${workspaceFolder}/trunk/ide/srs_clion/CMakeLists.txt` | ||
| > and `${workspaceFolder}/trunk/ide/vscode-build` as the source file and build directory. | ||
| Click the `Run > Run Without Debugging` button to start the server. | ||
|
|
||
| > Note: The `launch.json` is used for running and debugging. The build will output the binary to | ||
| > `${workspaceFolder}/trunk/ide/vscode-build/srs`. | ||
| ## Proxy | ||
|
|
||
| Install the following extensions: | ||
|
|
||
| - Go | ||
|
|
||
| Open the folder like `~/git/srs` in VSCode. | ||
|
|
||
| Select the `View > Run` and select `Launch srs-proxy` to start the proxy server. | ||
|
|
||
| Click the `Run > Run Without Debugging` button to start the server. | ||
|
|
||
| > Note: The `launch.json` is used for running and debugging. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| { | ||
| "version": "0.2.0", | ||
| "configurations": [ | ||
| { | ||
| "name": "Launch SRS", | ||
| "type": "cppdbg", | ||
| "request": "launch", | ||
| "program": "${workspaceFolder}/trunk/ide/vscode-build/srs", | ||
| "args": ["-c", "conf/console.conf"], | ||
| "stopAtEntry": false, | ||
| "cwd": "${workspaceFolder}/trunk", | ||
| "environment": [], | ||
| "externalConsole": false, | ||
| "MIMode": "lldb", | ||
| "setupCommands": [ | ||
| { | ||
| "description": "Enable pretty-printing for gdb", | ||
| "text": "-enable-pretty-printing", | ||
| "ignoreFailures": true | ||
| } | ||
| ], | ||
| "preLaunchTask": "build", | ||
| "logging": { | ||
| "engineLogging": true | ||
| } | ||
| }, | ||
| { | ||
| "name": "Launch srs-proxy", | ||
| "type": "go", | ||
| "request": "launch", | ||
| "mode": "auto", | ||
| "cwd": "${workspaceFolder}/proxy", | ||
| "program": "${workspaceFolder}/proxy" | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| { | ||
| "cmake.sourceDirectory": "${workspaceFolder}/trunk/ide/srs_clion", | ||
| "cmake.buildDirectory": "${workspaceFolder}/trunk/ide/vscode-build", | ||
| "cmake.configureOnOpen": false | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| { | ||
| "version": "2.0.0", | ||
| "tasks": [ | ||
| { | ||
| "label": "build", | ||
| "type": "shell", | ||
| "command": "cmake --build ${workspaceFolder}/trunk/ide/vscode-build", | ||
| "group": { | ||
| "kind": "build", | ||
| "isDefault": true | ||
| }, | ||
| "problemMatcher": ["$gcc"], | ||
| "detail": "Build SRS by cmake." | ||
| } | ||
| ] | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.