Skip to content

Commit a53d74f

Browse files
sbd021xianing
sbd021
authored and
xianing
committed
windows multiprocess 64 and update readme
1 parent 90f89a5 commit a53d74f

File tree

7 files changed

+125
-7
lines changed

7 files changed

+125
-7
lines changed

‎windows/APIExample/APIExample.sln‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,12 @@ Global
2525
{DB16CA2F-3910-4449-A5BD-6A602B33BE0F}.Release|x64.Build.0 = Release|x64
2626
{2B345C3C-4BEA-4DA3-B754-43F9AD219D4A}.Debug|Win32.ActiveCfg = Debug|Win32
2727
{2B345C3C-4BEA-4DA3-B754-43F9AD219D4A}.Debug|Win32.Build.0 = Debug|Win32
28-
{2B345C3C-4BEA-4DA3-B754-43F9AD219D4A}.Debug|x64.ActiveCfg = Debug|Win32
28+
{2B345C3C-4BEA-4DA3-B754-43F9AD219D4A}.Debug|x64.ActiveCfg = Debug|x64
29+
{2B345C3C-4BEA-4DA3-B754-43F9AD219D4A}.Debug|x64.Build.0 = Debug|x64
2930
{2B345C3C-4BEA-4DA3-B754-43F9AD219D4A}.Release|Win32.ActiveCfg = Release|Win32
3031
{2B345C3C-4BEA-4DA3-B754-43F9AD219D4A}.Release|Win32.Build.0 = Release|Win32
31-
{2B345C3C-4BEA-4DA3-B754-43F9AD219D4A}.Release|x64.ActiveCfg = Release|Win32
32+
{2B345C3C-4BEA-4DA3-B754-43F9AD219D4A}.Release|x64.ActiveCfg = Debug|x64
33+
{2B345C3C-4BEA-4DA3-B754-43F9AD219D4A}.Release|x64.Build.0 = Debug|x64
3234
EndGlobalSection
3335
GlobalSection(SolutionProperties) = preSolution
3436
HideSolutionNode = FALSE

‎windows/APIExample/APIExample/APIExample.vcxproj‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ if exist $(SolutionDir)MediaPlayerPart (copy $(SolutionDir)MediaPlayerPart\dll\l
131131
<ResourceOutputFileName>$(IntDir)$(TargetName)$(TargetExt).embed.manifest.res</ResourceOutputFileName>
132132
</ManifestResourceCompile>
133133
<PreBuildEvent>
134-
<Command>$(SolutionDir)installThirdParty.bat</Command>
134+
<Command>$(SolutionDir)installThirdParty.bat x86</Command>
135135
</PreBuildEvent>
136136
</ItemDefinitionGroup>
137137
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -220,6 +220,9 @@ if exist $(SolutionDir)MediaPlayerPart (copy $(SolutionDir)MediaPlayerPart\dll\A
220220
<Manifest>
221221
<EnableDpiAwareness>PerMonitorHighDPIAware</EnableDpiAwareness>
222222
</Manifest>
223+
<PreBuildEvent>
224+
<Command>$(SolutionDir)installThirdParty) x86</Command>
225+
</PreBuildEvent>
223226
</ItemDefinitionGroup>
224227
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
225228
<ClCompile>

‎windows/APIExample/APIExample/Advanced/MultiVideoSource/ProcessScreenShare/ProcessScreenShare.vcxproj‎

Lines changed: 94 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,18 @@
55
<Configuration>Debug</Configuration>
66
<Platform>Win32</Platform>
77
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Debug|x64">
9+
<Configuration>Debug</Configuration>
10+
<Platform>x64</Platform>
11+
</ProjectConfiguration>
812
<ProjectConfiguration Include="Release|Win32">
913
<Configuration>Release</Configuration>
1014
<Platform>Win32</Platform>
1115
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Release|x64">
17+
<Configuration>Release</Configuration>
18+
<Platform>x64</Platform>
19+
</ProjectConfiguration>
1220
</ItemGroup>
1321
<PropertyGroup Label="Globals">
1422
<ProjectGuid>{2B345C3C-4BEA-4DA3-B754-43F9AD219D4A}</ProjectGuid>
@@ -24,6 +32,13 @@
2432
<CharacterSet>Unicode</CharacterSet>
2533
<UseOfMfc>Dynamic</UseOfMfc>
2634
</PropertyGroup>
35+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
36+
<ConfigurationType>Application</ConfigurationType>
37+
<UseDebugLibraries>true</UseDebugLibraries>
38+
<PlatformToolset>v141</PlatformToolset>
39+
<CharacterSet>Unicode</CharacterSet>
40+
<UseOfMfc>Dynamic</UseOfMfc>
41+
</PropertyGroup>
2742
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
2843
<ConfigurationType>Application</ConfigurationType>
2944
<UseDebugLibraries>false</UseDebugLibraries>
@@ -32,26 +47,50 @@
3247
<CharacterSet>Unicode</CharacterSet>
3348
<UseOfMfc>Dynamic</UseOfMfc>
3449
</PropertyGroup>
50+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
51+
<ConfigurationType>Application</ConfigurationType>
52+
<UseDebugLibraries>false</UseDebugLibraries>
53+
<PlatformToolset>v141</PlatformToolset>
54+
<WholeProgramOptimization>true</WholeProgramOptimization>
55+
<CharacterSet>Unicode</CharacterSet>
56+
<UseOfMfc>Dynamic</UseOfMfc>
57+
</PropertyGroup>
3558
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
3659
<ImportGroup Label="ExtensionSettings">
3760
</ImportGroup>
3861
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
3962
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
4063
</ImportGroup>
64+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
65+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
66+
</ImportGroup>
4167
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
4268
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
4369
</ImportGroup>
70+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
71+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
72+
</ImportGroup>
4473
<PropertyGroup Label="UserMacros" />
4574
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
75+
<LinkIncremental>true</LinkIncremental>
76+
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
77+
<LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);</LibraryPath>
78+
</PropertyGroup>
79+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
4680
<LinkIncremental>true</LinkIncremental>
4781
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);../../../sdk/include;../sdk/include;../openLive/</IncludePath>
48-
<LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);../../../sdk/lib;../sdk/lib;</LibraryPath>
82+
<LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64);</LibraryPath>
4983
</PropertyGroup>
5084
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
5185
<LinkIncremental>false</LinkIncremental>
5286
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(WindowsSdk_71A_IncludePath);../../../sdk/include;../sdk/include;../openLive/</IncludePath>
5387
<LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(WindowsSdk_71A_LibraryPath_x86);../../../sdk/lib;../sdk/lib;</LibraryPath>
5488
</PropertyGroup>
89+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
90+
<LinkIncremental>false</LinkIncremental>
91+
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(WindowsSdk_71A_IncludePath);../../../sdk/include;../sdk/include;../openLive/</IncludePath>
92+
<LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(WindowsSdk_71A_LibraryPath_x64);</LibraryPath>
93+
</PropertyGroup>
5594
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
5695
<ClCompile>
5796
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -77,6 +116,30 @@
77116
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
78117
</ResourceCompile>
79118
</ItemDefinitionGroup>
119+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
120+
<ClCompile>
121+
<PrecompiledHeader>Use</PrecompiledHeader>
122+
<WarningLevel>Level3</WarningLevel>
123+
<Optimization>Disabled</Optimization>
124+
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
125+
<SDLCheck>true</SDLCheck>
126+
<AdditionalIncludeDirectories>$(SolutionDir)libs\include;$(solutionDir)ThirdParty\libYUV;$(ProjectDir);</AdditionalIncludeDirectories>
127+
</ClCompile>
128+
<Link>
129+
<SubSystem>Windows</SubSystem>
130+
<GenerateDebugInformation>true</GenerateDebugInformation>
131+
<AdditionalLibraryDirectories>$(SolutionDir)libs\x86_64;$(SolutionDir)ThirdParty\libyuv\$(Configuration);</AdditionalLibraryDirectories>
132+
</Link>
133+
<Midl>
134+
<MkTypLibCompatible>false</MkTypLibCompatible>
135+
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
136+
</Midl>
137+
<ResourceCompile>
138+
<Culture>0x0409</Culture>
139+
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
140+
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
141+
</ResourceCompile>
142+
</ItemDefinitionGroup>
80143
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
81144
<ClCompile>
82145
<WarningLevel>Level3</WarningLevel>
@@ -106,6 +169,34 @@
106169
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
107170
</ResourceCompile>
108171
</ItemDefinitionGroup>
172+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
173+
<ClCompile>
174+
<WarningLevel>Level3</WarningLevel>
175+
<PrecompiledHeader>Use</PrecompiledHeader>
176+
<Optimization>MaxSpeed</Optimization>
177+
<FunctionLevelLinking>true</FunctionLevelLinking>
178+
<IntrinsicFunctions>true</IntrinsicFunctions>
179+
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
180+
<SDLCheck>true</SDLCheck>
181+
<AdditionalIncludeDirectories>$(SolutionDir)libs\include;$(solutionDir)ThirdParty\libYUV;$(ProjectDir);</AdditionalIncludeDirectories>
182+
</ClCompile>
183+
<Link>
184+
<SubSystem>Windows</SubSystem>
185+
<GenerateDebugInformation>true</GenerateDebugInformation>
186+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
187+
<OptimizeReferences>true</OptimizeReferences>
188+
<AdditionalLibraryDirectories>$(SolutionDir)libs\x86_64;$(SolutionDir)ThirdParty\libyuv\$(Configuration);$(SolutionDir)</AdditionalLibraryDirectories>
189+
</Link>
190+
<Midl>
191+
<MkTypLibCompatible>false</MkTypLibCompatible>
192+
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
193+
</Midl>
194+
<ResourceCompile>
195+
<Culture>0x0409</Culture>
196+
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
197+
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
198+
</ResourceCompile>
199+
</ItemDefinitionGroup>
109200
<ItemGroup>
110201
<Text Include="ReadMe.txt" />
111202
</ItemGroup>
@@ -123,7 +214,9 @@
123214
<ClCompile Include="ProcessScreenShareDlg.cpp" />
124215
<ClCompile Include="stdafx.cpp">
125216
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
217+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
126218
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
219+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
127220
</ClCompile>
128221
</ItemGroup>
129222
<ItemGroup>

‎windows/APIExample/installThirdParty_x64.bat‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
cd /d %~dp0
2+
3+
if not exist .\libs (
4+
if exist ..\..\..\libs (
5+
echo d | xcopy ..\..\..\libs .\libs /Y /E /Q
6+
)
7+
)
8+
9+
powershell.exe -command ^
10+
"& {set-executionpolicy Remotesigned -Scope Process; ./'install.ps1' 'x64'}"

‎windows/APIExample/installThirdParty_x86.bat‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
cd /d %~dp0
2+
3+
if not exist .\libs (
4+
if exist ..\..\..\libs (
5+
echo d | xcopy ..\..\..\libs .\libs /Y /E /Q
6+
)
7+
)
8+
9+
powershell.exe -command ^
10+
"& {set-executionpolicy Remotesigned -Scope Process; ./'install.ps1' 'x86'}"

‎windows/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ The project uses a single program to combine a variety of functionalities. Each
5050
1. Navigate to the **windows** folder and run following command to install project dependencies:
5151

5252
```shell
53-
$ installThirdParty.bat
53+
$ installThirdParty_x86.bat or installThirdParty_x64.bat. You can also go to next step. It will download depdencies when build solution.
5454
```
55-
55+
5656
**Note:**
5757
If you encounter ps1 script errors, you may need to update your powershell.
5858

‎windows/README.zh.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ _[English](README.md) | 中文_
5353
1. 在 **windows** 目录下运行 `installThirdParty.bat` 文件安装依赖项:
5454

5555
```shell
56-
$ installThirdParty.bat
56+
$ installThirdParty_x86.bat 或者installThirdParty_x64.bat。也可以直接到下一步，当build solution的时候会直接下载依赖库。
5757
```
5858

5959
**注意:**

0 commit comments

Comments
 (0)