Skip to content

Commit af4586e

Browse files
committed
update:example
update:build workflows/msbuild.yml
1 parent 28904fd commit af4586e

File tree

3 files changed

+8
-19
lines changed

3 files changed

+8
-19
lines changed

.github/workflows/msbuild.yml

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -70,17 +70,13 @@ jobs:
7070
echo "XENGINE_LIB32=${{ github.workspace }}/libxengine/XEngine_Windows/x86" | Out-File -FilePath $env:GITHUB_ENV -Append
7171
echo "XENGINE_LIB64=${{ github.workspace }}/libxengine/XEngine_Windows/x64" | Out-File -FilePath $env:GITHUB_ENV -Append
7272
shell: pwsh
73-
74-
- name: Set code page
75-
run: chcp 65001
76-
shell: pwsh
7773

7874
# 配置 MSBuild 的路径,准备构建 VC++ 项目
7975
- name: Setup MSBuild
8076
uses: microsoft/setup-msbuild@v2
8177
#编译
8278
- name: Build Solution
83-
run: msbuild XEngine_Source/XEngine.sln /p:Configuration=${{ matrix.configuration }} /p:Platform=${{ matrix.platform }} /p:AdditionalOptions="/utf-8"
79+
run: msbuild XEngine_Source/XEngine.sln /p:Configuration=${{ matrix.configuration }} /p:Platform=${{ matrix.platform }}
8480
#测试
8581
- name: Conditional Step for x86 Release
8682
if: matrix.configuration == 'Release' && matrix.platform == 'x86'
@@ -95,17 +91,10 @@ jobs:
9591
- name: Conditional Step for x86 Debug
9692
if: matrix.configuration == 'Debug' && matrix.platform == 'x86'
9793
run: |
98-
$VerbosePreference = 'Continue'
99-
Write-Verbose "Running debug build"
10094
cp -r XEngine_Source/Debug/*.dll XEngine_Release/
10195
cp -r XEngine_Source/Debug/*.exe XEngine_Release/
10296
cp -r XEngine_Source/VSCopy_x86.bat XEngine_Release/
10397
cd XEngine_Release
10498
./VSCopy_x86.bat
105-
106-
try {
107-
./XEngine_StreamMediaApp.exe -t
108-
} catch {
109-
Write-Error "Execution failed with error: $_"
110-
}
111-
shell: pwsh
99+
./XEngine_StreamMediaApp.exe -t
100+
shell: pwsh

XEngine_APPClient/APPClient_WebRTC/APPClient_WebRTC.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -354,9 +354,9 @@ int main()
354354
int nMSGLen = 0;
355355
XSOCKET hSocket;
356356
XCHAR tszMSGBuffer[2048] = {};
357-
//LPCXSTR lpszAPIUrl = _X("http://127.0.0.1:5600/rtc/v1/whep/?app=live&stream=livestream");
357+
LPCXSTR lpszAPIUrl = _X("http://127.0.0.1:5600/rtc/v1/whep/?app=live&stream=livestream");
358358
//LPCXSTR lpszAPIUrl = _X("http://app.xyry.org:1985/rtc/v1/whep/?app=live&stream=livestream");
359-
LPCXSTR lpszAPIUrl = _X("http://10.0.3.154:1985/rtc/v1/whep/?app=live&stream=livestream");
359+
//LPCXSTR lpszAPIUrl = _X("http://10.0.3.154:1985/rtc/v1/whep/?app=live&stream=livestream");
360360
LPCXSTR lpszFileCert = _X("");
361361

362362
APPClient_WEBRTC_SDPPacket(lpszAPIUrl, lpszFileCert, tszMSGBuffer, &nMSGLen);
@@ -374,9 +374,9 @@ int main()
374374
BaseLib_OperatorMemory_FreeCStyle((XPPMEM)&ptszMSGBuffer);
375375

376376
XClient_UDPSelect_Create(&hSocket);
377-
XClient_UDPSelect_Connect(hSocket, "10.0.3.154", 8000);
377+
//XClient_UDPSelect_Connect(hSocket, "10.0.3.154", 8000);
378378
//XClient_UDPSelect_Connect(hSocket, "43.139.170.67", 8000);
379-
//XClient_UDPSelect_Connect(hSocket, "127.0.0.1", 5604);
379+
XClient_UDPSelect_Connect(hSocket, "127.0.0.1", 5604);
380380

381381
std::thread pSTDThread_Stun(APPClient_WEBRTC_StunSend, hSocket, tszICEUser, tszICEPass);
382382
pSTDThread_Stun.detach();

XEngine_Source/XEngine_BuildSwitch.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
// History:
1212
*********************************************************************/
1313
#define _XENGINE_STREAMMEDIA_BUILDSWITCH_SRT 0 //SRT协议编译开关选项
14-
#define _XENGINE_STREAMMEDIA_BUILDSWITCH_RTC 1 //WEBRTC协议编译开关选项
14+
#define _XENGINE_STREAMMEDIA_BUILDSWITCH_RTC 0 //WEBRTC协议编译开关选项

0 commit comments

Comments
 (0)