update libcurl and remove openssl dependencyupdate-lib-curl-pr

1 files changed, 6 insertions, 141 deletions

diff --git a/NorthstarDLL/NorthstarDLL.vcxproj b/NorthstarDLL/NorthstarDLL.vcxproj
index ebbeb375..42d9ea6a 100644
--- a/NorthstarDLL/NorthstarDLL.vcxproj
+++ b/NorthstarDLL/NorthstarDLL.vcxproj
@@ -102,7 +102,7 @@
       <OptimizeReferences>true</OptimizeReferences>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <EnableUAC>false</EnableUAC>

-      <AdditionalDependencies>$(SolutionDir)include\MinHook.x64.lib;$(SolutionDir)include\libcurl\lib\libcurl_a.lib;dbghelp.lib;Wldap32.lib;Normaliz.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>$(SolutionDir)include\MinHook.x64.lib;$(SolutionDir)include\libcurl\libcurl.lib;dbghelp.lib;Wldap32.lib;Normaliz.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <ForceSymbolReferences>

       </ForceSymbolReferences>

       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

@@ -120,6 +120,7 @@
     <ClInclude Include="..\include\libcurl\include\curl\curl.h" />

     <ClInclude Include="..\include\libcurl\include\curl\curlver.h" />

     <ClInclude Include="..\include\libcurl\include\curl\easy.h" />

+    <ClInclude Include="..\include\libcurl\include\curl\header.h" />

     <ClInclude Include="..\include\libcurl\include\curl\mprintf.h" />

     <ClInclude Include="..\include\libcurl\include\curl\multi.h" />

     <ClInclude Include="..\include\libcurl\include\curl\options.h" />

@@ -127,144 +128,8 @@
     <ClInclude Include="..\include\libcurl\include\curl\system.h" />

     <ClInclude Include="..\include\libcurl\include\curl\typecheck-gcc.h" />

     <ClInclude Include="..\include\libcurl\include\curl\urlapi.h" />

+    <ClInclude Include="..\include\libcurl\include\curl\websockets.h" />

     <ClInclude Include="..\include\MinHook.h" />

-    <ClInclude Include="..\include\openssl\aes.h" />

-    <ClInclude Include="..\include\openssl\asn1.h" />

-    <ClInclude Include="..\include\openssl\asn1err.h" />

-    <ClInclude Include="..\include\openssl\asn1t.h" />

-    <ClInclude Include="..\include\openssl\asn1_mac.h" />

-    <ClInclude Include="..\include\openssl\async.h" />

-    <ClInclude Include="..\include\openssl\asyncerr.h" />

-    <ClInclude Include="..\include\openssl\bio.h" />

-    <ClInclude Include="..\include\openssl\bioerr.h" />

-    <ClInclude Include="..\include\openssl\blowfish.h" />

-    <ClInclude Include="..\include\openssl\bn.h" />

-    <ClInclude Include="..\include\openssl\bnerr.h" />

-    <ClInclude Include="..\include\openssl\buffer.h" />

-    <ClInclude Include="..\include\openssl\buffererr.h" />

-    <ClInclude Include="..\include\openssl\camellia.h" />

-    <ClInclude Include="..\include\openssl\cast.h" />

-    <ClInclude Include="..\include\openssl\cmac.h" />

-    <ClInclude Include="..\include\openssl\cmp.h" />

-    <ClInclude Include="..\include\openssl\cmperr.h" />

-    <ClInclude Include="..\include\openssl\cmp_util.h" />

-    <ClInclude Include="..\include\openssl\cms.h" />

-    <ClInclude Include="..\include\openssl\cmserr.h" />

-    <ClInclude Include="..\include\openssl\comp.h" />

-    <ClInclude Include="..\include\openssl\comperr.h" />

-    <ClInclude Include="..\include\openssl\conf.h" />

-    <ClInclude Include="..\include\openssl\conferr.h" />

-    <ClInclude Include="..\include\openssl\configuration.h" />

-    <ClInclude Include="..\include\openssl\conftypes.h" />

-    <ClInclude Include="..\include\openssl\conf_api.h" />

-    <ClInclude Include="..\include\openssl\core.h" />

-    <ClInclude Include="..\include\openssl\core_dispatch.h" />

-    <ClInclude Include="..\include\openssl\core_names.h" />

-    <ClInclude Include="..\include\openssl\core_object.h" />

-    <ClInclude Include="..\include\openssl\crmf.h" />

-    <ClInclude Include="..\include\openssl\crmferr.h" />

-    <ClInclude Include="..\include\openssl\crypto.h" />

-    <ClInclude Include="..\include\openssl\cryptoerr.h" />

-    <ClInclude Include="..\include\openssl\cryptoerr_legacy.h" />

-    <ClInclude Include="..\include\openssl\ct.h" />

-    <ClInclude Include="..\include\openssl\cterr.h" />

-    <ClInclude Include="..\include\openssl\decoder.h" />

-    <ClInclude Include="..\include\openssl\decodererr.h" />

-    <ClInclude Include="..\include\openssl\des.h" />

-    <ClInclude Include="..\include\openssl\dh.h" />

-    <ClInclude Include="..\include\openssl\dherr.h" />

-    <ClInclude Include="..\include\openssl\dsa.h" />

-    <ClInclude Include="..\include\openssl\dsaerr.h" />

-    <ClInclude Include="..\include\openssl\dtls1.h" />

-    <ClInclude Include="..\include\openssl\ebcdic.h" />

-    <ClInclude Include="..\include\openssl\ec.h" />

-    <ClInclude Include="..\include\openssl\ecdh.h" />

-    <ClInclude Include="..\include\openssl\ecdsa.h" />

-    <ClInclude Include="..\include\openssl\ecerr.h" />

-    <ClInclude Include="..\include\openssl\encoder.h" />

-    <ClInclude Include="..\include\openssl\encodererr.h" />

-    <ClInclude Include="..\include\openssl\engine.h" />

-    <ClInclude Include="..\include\openssl\engineerr.h" />

-    <ClInclude Include="..\include\openssl\err.h" />

-    <ClInclude Include="..\include\openssl\ess.h" />

-    <ClInclude Include="..\include\openssl\esserr.h" />

-    <ClInclude Include="..\include\openssl\evp.h" />

-    <ClInclude Include="..\include\openssl\evperr.h" />

-    <ClInclude Include="..\include\openssl\e_os2.h" />

-    <ClInclude Include="..\include\openssl\fipskey.h" />

-    <ClInclude Include="..\include\openssl\fips_names.h" />

-    <ClInclude Include="..\include\openssl\hmac.h" />

-    <ClInclude Include="..\include\openssl\http.h" />

-    <ClInclude Include="..\include\openssl\httperr.h" />

-    <ClInclude Include="..\include\openssl\idea.h" />

-    <ClInclude Include="..\include\openssl\kdf.h" />

-    <ClInclude Include="..\include\openssl\kdferr.h" />

-    <ClInclude Include="..\include\openssl\lhash.h" />

-    <ClInclude Include="..\include\openssl\macros.h" />

-    <ClInclude Include="..\include\openssl\md2.h" />

-    <ClInclude Include="..\include\openssl\md4.h" />

-    <ClInclude Include="..\include\openssl\md5.h" />

-    <ClInclude Include="..\include\openssl\mdc2.h" />

-    <ClInclude Include="..\include\openssl\modes.h" />

-    <ClInclude Include="..\include\openssl\objects.h" />

-    <ClInclude Include="..\include\openssl\objectserr.h" />

-    <ClInclude Include="..\include\openssl\obj_mac.h" />

-    <ClInclude Include="..\include\openssl\ocsp.h" />

-    <ClInclude Include="..\include\openssl\ocsperr.h" />

-    <ClInclude Include="..\include\openssl\opensslconf.h" />

-    <ClInclude Include="..\include\openssl\opensslv.h" />

-    <ClInclude Include="..\include\openssl\ossl_typ.h" />

-    <ClInclude Include="..\include\openssl\params.h" />

-    <ClInclude Include="..\include\openssl\param_build.h" />

-    <ClInclude Include="..\include\openssl\pem.h" />

-    <ClInclude Include="..\include\openssl\pem2.h" />

-    <ClInclude Include="..\include\openssl\pemerr.h" />

-    <ClInclude Include="..\include\openssl\pkcs12.h" />

-    <ClInclude Include="..\include\openssl\pkcs12err.h" />

-    <ClInclude Include="..\include\openssl\pkcs7.h" />

-    <ClInclude Include="..\include\openssl\pkcs7err.h" />

-    <ClInclude Include="..\include\openssl\proverr.h" />

-    <ClInclude Include="..\include\openssl\provider.h" />

-    <ClInclude Include="..\include\openssl\prov_ssl.h" />

-    <ClInclude Include="..\include\openssl\rand.h" />

-    <ClInclude Include="..\include\openssl\randerr.h" />

-    <ClInclude Include="..\include\openssl\rc2.h" />

-    <ClInclude Include="..\include\openssl\rc4.h" />

-    <ClInclude Include="..\include\openssl\rc5.h" />

-    <ClInclude Include="..\include\openssl\ripemd.h" />

-    <ClInclude Include="..\include\openssl\rsa.h" />

-    <ClInclude Include="..\include\openssl\rsaerr.h" />

-    <ClInclude Include="..\include\openssl\safestack.h" />

-    <ClInclude Include="..\include\openssl\seed.h" />

-    <ClInclude Include="..\include\openssl\self_test.h" />

-    <ClInclude Include="..\include\openssl\sha.h" />

-    <ClInclude Include="..\include\openssl\srp.h" />

-    <ClInclude Include="..\include\openssl\srtp.h" />

-    <ClInclude Include="..\include\openssl\ssl.h" />

-    <ClInclude Include="..\include\openssl\ssl2.h" />

-    <ClInclude Include="..\include\openssl\ssl3.h" />

-    <ClInclude Include="..\include\openssl\sslerr.h" />

-    <ClInclude Include="..\include\openssl\sslerr_legacy.h" />

-    <ClInclude Include="..\include\openssl\stack.h" />

-    <ClInclude Include="..\include\openssl\store.h" />

-    <ClInclude Include="..\include\openssl\storeerr.h" />

-    <ClInclude Include="..\include\openssl\symhacks.h" />

-    <ClInclude Include="..\include\openssl\tls1.h" />

-    <ClInclude Include="..\include\openssl\trace.h" />

-    <ClInclude Include="..\include\openssl\ts.h" />

-    <ClInclude Include="..\include\openssl\tserr.h" />

-    <ClInclude Include="..\include\openssl\txt_db.h" />

-    <ClInclude Include="..\include\openssl\types.h" />

-    <ClInclude Include="..\include\openssl\ui.h" />

-    <ClInclude Include="..\include\openssl\uierr.h" />

-    <ClInclude Include="..\include\openssl\whrlpool.h" />

-    <ClInclude Include="..\include\openssl\x509.h" />

-    <ClInclude Include="..\include\openssl\x509err.h" />

-    <ClInclude Include="..\include\openssl\x509v3.h" />

-    <ClInclude Include="..\include\openssl\x509v3err.h" />

-    <ClInclude Include="..\include\openssl\x509_vfy.h" />

-    <ClInclude Include="..\include\openssl\__DECC_INCLUDE_EPILOGUE.H" />

-    <ClInclude Include="..\include\openssl\__DECC_INCLUDE_PROLOGUE.H" />

     <ClInclude Include="..\include\rapidjson\allocators.h" />

     <ClInclude Include="..\include\rapidjson\document.h" />

     <ClInclude Include="..\include\rapidjson\encodedstream.h" />

@@ -447,7 +312,7 @@
     <ClInclude Include="squirrel\squirreldatatypes.h" />

     <ClInclude Include="util\utils.h" />

     <ClInclude Include="util\version.h" />

-		<ClInclude Include="util\wininfo.h" />

+    <ClInclude Include="util\wininfo.h" />

   </ItemGroup>

   <ItemGroup>

     <None Include="..\include\spdlog\fmt\bundled\LICENSE.rst" />

@@ -538,7 +403,7 @@
     <ClCompile Include="util\printmaps.cpp" />

     <ClCompile Include="util\utils.cpp" />

     <ClCompile Include="util\version.cpp" />

-		<ClCompile Include="util\wininfo.cpp" />

+    <ClCompile Include="util\wininfo.cpp" />

   </ItemGroup>

   <ItemGroup>

     <MASM Include="audio_asm.asm" />

@@ -547,4 +412,4 @@
   <ImportGroup Label="ExtensionTargets">

     <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />

   </ImportGroup>

-</Project>

+</Project>
\ No newline at end of file