Skip to content

Commit dac2c16

Browse files
ras0219ras0219-msft
authored andcommitted
Consolidate x509's into a single file. No need to have a file per (mutually exclusive) function.
1 parent 5f75ec9 commit dac2c16

12 files changed

+392
-484
lines changed

Release/src/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,12 @@ if(UNIX)
4040
if(APPLE)
4141
list(APPEND SOURCES
4242
pplx/pplxapple.cpp
43-
http/client/x509_cert_utilities_apple.cpp
4443
)
4544
find_library(COREFOUNDATION CoreFoundation "/")
4645
find_library(SECURITY Security "/")
4746
set(EXTRALINKS ${COREFOUNDATION} ${SECURITY})
4847
elseif(ANDROID)
4948
list(APPEND SOURCES
50-
http/client/x509_cert_utilities_android.cpp
5149
pplx/pplxlinux.cpp
5250
)
5351
else()
@@ -62,7 +60,6 @@ elseif(WIN32)
6260
set(SOURCES
6361
${SOURCES_COMMON}
6462
http/client/http_client_winhttp.cpp
65-
http/client/x509_cert_utilities_win32.cpp
6663
http/listener/http_server_httpsys.cpp
6764
pplx/pplxwin.cpp
6865
streams/fileio_win32.cpp

Release/src/build/android.vcxitems

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
</ItemDefinitionGroup>
1616
<ItemGroup>
1717
<ClCompile Include="$(MSBuildThisFileDirectory)..\http\client\http_client_asio.cpp" />
18-
<ClCompile Include="$(MSBuildThisFileDirectory)..\http\client\x509_cert_utilities_android.cpp" />
1918
<ClCompile Include="$(MSBuildThisFileDirectory)..\http\listener\http_server_asio.cpp" />
2019
<ClCompile Include="$(MSBuildThisFileDirectory)..\pplx\pplxlinux.cpp" />
2120
<ClCompile Include="$(MSBuildThisFileDirectory)..\pplx\threadpool.cpp" />

Release/src/build/android.vcxitems.filters

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
<ClCompile Include="$(MSBuildThisFileDirectory)..\pplx\threadpool.cpp">
2020
<Filter>Source Files</Filter>
2121
</ClCompile>
22-
<ClCompile Include="$(MSBuildThisFileDirectory)..\http\client\x509_cert_utilities_android.cpp">
23-
<Filter>Source Files</Filter>
24-
</ClCompile>
2522
</ItemGroup>
2623
<ItemGroup>
2724
<Filter Include="Source Files">

Release/src/build/other.vcxitems

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
</ClCompile>
1515
</ItemDefinitionGroup>
1616
<ItemGroup>
17-
<ClCompile Include="$(MSBuildThisFileDirectory)..\http\client\x509_cert_utilities_apple.cpp" />
1817
<ClCompile Include="$(MSBuildThisFileDirectory)..\pplx\pplxapple.cpp" />
1918
</ItemGroup>
2019
<ItemGroup>

Release/src/build/other.vcxitems.filters

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,5 @@
1212
<ClCompile Include="$(MSBuildThisFileDirectory)..\pplx\pplxapple.cpp">
1313
<Filter>Source Files</Filter>
1414
</ClCompile>
15-
<ClCompile Include="$(MSBuildThisFileDirectory)..\http\client\x509_cert_utilities_apple.cpp">
16-
<Filter>Source Files</Filter>
17-
</ClCompile>
1815
</ItemGroup>
1916
</Project>

Release/src/build/win32.vcxitems

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
</ItemDefinitionGroup>
1616
<ItemGroup>
1717
<ClCompile Include="$(MSBuildThisFileDirectory)..\http\client\http_client_winhttp.cpp" />
18-
<ClCompile Include="$(MSBuildThisFileDirectory)..\http\client\x509_cert_utilities_win32.cpp" />
1918
<ClCompile Include="$(MSBuildThisFileDirectory)..\http\listener\http_server_httpsys.cpp" />
2019
<ClCompile Include="$(MSBuildThisFileDirectory)..\pplx\pplxwin.cpp" />
2120
<ClCompile Include="$(MSBuildThisFileDirectory)..\streams\fileio_win32.cpp" />

Release/src/build/win32.vcxitems.filters

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313
<ClCompile Include="$(MSBuildThisFileDirectory)..\http\listener\http_server_httpsys.cpp">
1414
<Filter>Source Files</Filter>
1515
</ClCompile>
16-
<ClCompile Include="$(MSBuildThisFileDirectory)..\http\client\x509_cert_utilities_win32.cpp">
17-
<Filter>Source Files</Filter>
18-
</ClCompile>
1916
<ClCompile Include="$(MSBuildThisFileDirectory)..\pplx\pplxwin.cpp">
2017
<Filter>Source Files</Filter>
2118
</ClCompile>

0 commit comments

Comments
 (0)