Skip to content

Commit

Permalink
windows update to 3.0.1 and qt azure pipeline
Browse files Browse the repository at this point in the history
  • Loading branch information
sbd021 committed Jun 11, 2020
1 parent faa04ff commit 37fbb21
Show file tree
Hide file tree
Showing 22 changed files with 6,194 additions and 5,017 deletions.
3 changes: 2 additions & 1 deletion Group-Video/OpenVideoCall-Windows-MFC/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -352,4 +352,5 @@ ASALocalRun/
*.exe
*.out
*.app
sdk/
sdk/
libs/
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,9 @@
<PostBuildEvent>
<Command>if exist ..\sdk (copy ..\sdk\dll\*.dll ..\$(Configuration)\) else if exist ..\..\..\sdk (copy ..\..\..\sdk\dll\*.dll ..\$(Configuration)\)</Command>
</PostBuildEvent>
<PreBuildEvent>
<Command>$(SolutionDir)\prebuild.bat $(PlatformTarget) $(SolutionDir)</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
Expand All @@ -149,6 +152,9 @@
<PostBuildEvent>
<Command>if exist ..\sdk (copy ..\sdk\dll\*.dll ..\$(Configuration)\) else if exist ..\..\..\sdk (copy ..\..\..\sdk\dll\*.dll ..\$(Configuration)\)</Command>
</PostBuildEvent>
<PreBuildEvent>
<Command>$(SolutionDir)\prebuild.bat $(PlatformTarget) $(SolutionDir)</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
Expand Down Expand Up @@ -179,6 +185,9 @@
<PostBuildEvent>
<Command>if exist ..\sdk (copy ..\sdk\dll\*.dll ..\$(Configuration)\) else if exist ..\..\..\sdk (copy ..\..\..\sdk\dll\*.dll ..\$(Configuration)\)</Command>
</PostBuildEvent>
<PreBuildEvent>
<Command>$(SolutionDir)\prebuild.bat $(PlatformTarget) $(SolutionDir)</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
Expand Down Expand Up @@ -208,6 +217,9 @@
<PostBuildEvent>
<Command>if exist ..\sdk (copy ..\sdk\dll\*.dll ..\$(Configuration)\) else if exist ..\..\..\sdk (copy ..\..\..\sdk\dll\*.dll ..\$(Configuration)\)</Command>
</PostBuildEvent>
<PreBuildEvent>
<Command>$(SolutionDir)\prebuild.bat $(PlatformTarget) $(SolutionDir)</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<Text Include="ReadMe.txt" />
Expand Down
14 changes: 8 additions & 6 deletions Group-Video/OpenVideoCall-Windows-MFC/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ To build and run the sample application, get an App ID:
### Integrate the Agora Video SDK
1. Download the **Agora Video SDK** from [Agora.io SDK](https://www.agora.io/en/blog/download/). Unzip the downloaded SDK package and copy the **sdk** to the `OpenVideoCall` folder in project(the old one may be over written.
1. Download the **Agora Video SDK** from [Agora.io SDK](https://www.agora.io/en/blog/download/). Unzip the downloaded SDK package and copy the **libs** to the `OpenVideoCall` folder in project(the old one may be over written.
2. Open OpenVideoCall.sln, build the solution and run.
Expand All @@ -60,14 +60,16 @@ To build and run the sample application, get an App ID:
please select the OpenVideoCall project in the Solution Explorer and right click. In the pop-up menu bar, select "Set as active project" to solve. Then run the program again.
2. The dll library under the sdk/dll file needs to be placed in the corresponding execution path.
Tips: The relevant dll library has been configured for you in this case tutorial. If you want to use the interface provided by agora for related development, you need to put the dll library into the corresponding execution path as prompted above.
## Resources
- You can find full API document at [Document Center](https://docs.agora.io/en/)
- You can file bugs about this demo at [issue](https://github.com/AgoraIO/Basic-Video-Call/issues)
- For potential issues, take a look at our [FAQ](https://docs.agora.io/cn/faq) first
- Dive into [Agora SDK Samples](https://github.com/AgoraIO) to see more tutorials
- Take a look at [Agora Use Case](https://github.com/AgoraIO-usecase) for more complicated real use case
- Repositories managed by developer communities can be found at [Agora Community](https://github.com/AgoraIO-Community)
- You can find full API documentation at [Document Center](https://docs.agora.io/en/)
- If you encounter problems during integration, you can ask question in [Stack Overflow](https://stackoverflow.com/questions/tagged/agora.io)
- You can file bugs about this sample at [issue](https://github.com/AgoraIO/Basic-Video-Call/issues)
## License
Expand Down
15 changes: 8 additions & 7 deletions Group-Video/OpenVideoCall-Windows-MFC/README.zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,25 +50,26 @@ Agora 视频 SDK 支持 iOS / Android / Windows / macOS 等多个平台,你可
1. 在 [Agora.io SDK](https://www.agora.io/cn/blog/download/) 下载 **视频通话 + 直播 SDK**,解压后将其中的 **sdk** 复制到本项目的 `OpenVideoCall` 文件夹下(并覆盖同名旧目录)。
2. 使用 VC++2013 打开 OpenVideoCall.sln,编译整个解决方案
2. 使用 VS2013 打开 OpenVideoCall.sln,编译整个解决方案
### 常见问题
1. 程序编译后,在运行程序时如若出现:无法启动程序 "xxx\xxx\xxx\Debug\Language\English.dll" 的错误提示, 请在解决方案资源管理器中选中 OpenVideoCall 项目,并右击,在弹出的菜单栏中选择 "设为启动项目",即可解决。之后重新运行程序即可。
2. sdk/dll 文件下的 dll 库也需要放在相应的执行路径下。
温馨提示:此案例教程中已经为您配置好相关的 dll 库,若用户想自己使用 agora 提供的接口进行相关开发,则需按上述提示将 dll 库放入相应的执行路径下。
## 联系我们
- 完整的 API 文档见 [文档中心](https://docs.agora.io/cn/)
- 如果在集成中遇到问题, 你可以到 [开发者社区](https://dev.agora.io/cn/) 提问
- 如果有售前咨询问题, 可以拨打 400 632 6626,或加入官方Q群 12742516 提问
- 如果需要售后技术支持, 你可以在 [Agora Dashboard](https://dashboard.agora.io) 提交工单
- 如果发现了示例代码的 bug, 欢迎提交 [issue](https://github.com/AgoraIO/Basic-Video-Call/issues)
- 如果你遇到了困难,可以先参阅[常见问题](https://docs.agora.io/cn/faq)
- 如果你想了解更多官方示例,可以参考[官方SDK示例](https://github.com/AgoraIO)
- 如果你想了解声网SDK在复杂场景下的应用,可以参考[官方场景案例](https://github.com/AgoraIO-usecase)
- 如果你想了解声网的一些社区开发者维护的项目,可以查看[社区](https://github.com/AgoraIO-Community)
- 完整的 API 文档见 [文档中心](https://docs.agora.io/cn/)
- 若遇到问题需要开发者帮助,你可以到 [开发者社区](https://rtcdeveloper.com/) 提问
- 如果发现了示例代码的 bug,欢迎提交 [issue](https://github.com/AgoraIO/Basic-Video-Call/issues)
## 代码许可
The MIT License (MIT)
51 changes: 51 additions & 0 deletions Group-Video/OpenVideoCall-Windows-MFC/prebuild.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
set sdkversion=small

set Machine=%~1
set absolute_path=%~2
cd %absolute_path%

if %sdkversion% == origin ( exit )


if %sdkversion% == small (
set sdkinclude=libs\include
set sdkdll=libs\x86
set sdklib=libs\x86
if %Machine% == x64 (
set sdkdll=libs\x86_64
set sdklib=libs\x86_64
)
)

if not exist sdk (
mkdir sdk
)

if exist sdk (
pushd sdk
if not exist dll (
mkdir dll
)

if not exist lib (
mkdir lib
)
if not exist include (
mkdir include
)
popd
)

if %sdkversion% == small (
if exist %sdkinclude% (
copy %sdkinclude%\*.h sdk\include
)

if exist %sdklib% (
copy %sdklib%\*.lib sdk\lib /y
)
if exist %sdkdll% (
copy %sdkdll%\*.dll sdk\dll /y
)
)
pause
Loading

0 comments on commit 37fbb21

Please sign in to comment.