2 Commits 4d65b66212 ... fd6ba67f5b

Author SHA1 Message Date
  huanggen fd6ba67f5b Merge branch 'master' of http://gitz.zhixinhuixue.net:18880/huanggen/UCloudSDK 11 months ago
  huanggen ca9a319286 调整第三方依赖库结果,使得Debug模式编译通过 11 months ago
48 changed files with 6 additions and 2 deletions
  1. 0 0
      ThirdParty/lib/Debug/PocoCrypto.dll
  2. 0 0
      ThirdParty/lib/Debug/PocoCrypto.lib
  3. 0 0
      ThirdParty/lib/Debug/PocoData.dll
  4. 0 0
      ThirdParty/lib/Debug/PocoDataODBC.dll
  5. 0 0
      ThirdParty/lib/Debug/PocoDataSQLite.dll
  6. 0 0
      ThirdParty/lib/Debug/PocoEncodings.dll
  7. 0 0
      ThirdParty/lib/Debug/PocoFoundation.dll
  8. 0 0
      ThirdParty/lib/Debug/PocoFoundation.lib
  9. 0 0
      ThirdParty/lib/Debug/PocoJSON.dll
  10. 0 0
      ThirdParty/lib/Debug/PocoJSON.lib
  11. 0 0
      ThirdParty/lib/Debug/PocoMongoDB.dll
  12. 0 0
      ThirdParty/lib/Debug/PocoNet.dll
  13. 0 0
      ThirdParty/lib/Debug/PocoNet.lib
  14. 0 0
      ThirdParty/lib/Debug/PocoNetSSL.dll
  15. 0 0
      ThirdParty/lib/Debug/PocoNetSSL.lib
  16. 0 0
      ThirdParty/lib/Debug/PocoRedis.dll
  17. 0 0
      ThirdParty/lib/Debug/PocoUtil.dll
  18. 0 0
      ThirdParty/lib/Debug/PocoUtil.lib
  19. 0 0
      ThirdParty/lib/Debug/PocoXML.dll
  20. 0 0
      ThirdParty/lib/Debug/PocoXML.lib
  21. BIN
      ThirdParty/lib/Debug/cossdk.lib
  22. BIN
      ThirdParty/lib/Debug/libcrypto-1_1.dll
  23. BIN
      ThirdParty/lib/Debug/libcrypto.lib
  24. BIN
      ThirdParty/lib/Debug/libssl-1_1.dll
  25. BIN
      ThirdParty/lib/Debug/libssl.lib
  26. BIN
      ThirdParty/lib/Debug/openssl.lib
  27. BIN
      ThirdParty/lib/Release/PocoCrypto.dll
  28. BIN
      ThirdParty/lib/Release/PocoCrypto.lib
  29. BIN
      ThirdParty/lib/Release/PocoData.dll
  30. BIN
      ThirdParty/lib/Release/PocoDataODBC.dll
  31. BIN
      ThirdParty/lib/Release/PocoDataSQLite.dll
  32. BIN
      ThirdParty/lib/Release/PocoEncodings.dll
  33. BIN
      ThirdParty/lib/Release/PocoFoundation.dll
  34. BIN
      ThirdParty/lib/Release/PocoFoundation.lib
  35. BIN
      ThirdParty/lib/Release/PocoJSON.dll
  36. BIN
      ThirdParty/lib/Release/PocoJSON.lib
  37. BIN
      ThirdParty/lib/Release/PocoMongoDB.dll
  38. BIN
      ThirdParty/lib/Release/PocoNet.dll
  39. BIN
      ThirdParty/lib/Release/PocoNet.lib
  40. BIN
      ThirdParty/lib/Release/PocoNetSSL.dll
  41. BIN
      ThirdParty/lib/Release/PocoNetSSL.lib
  42. BIN
      ThirdParty/lib/Release/PocoRedis.dll
  43. BIN
      ThirdParty/lib/Release/PocoUtil.dll
  44. BIN
      ThirdParty/lib/Release/PocoUtil.lib
  45. BIN
      ThirdParty/lib/Release/PocoXML.dll
  46. BIN
      ThirdParty/lib/Release/PocoXML.lib
  47. 0 0
      ThirdParty/lib/Release/cossdk.lib
  48. 6 2
      UCloudSDK/UCloudSDK.vcxproj

+ 0 - 0
ThirdParty/lib/PocoCrypto.dll → ThirdParty/lib/Debug/PocoCrypto.dll


+ 0 - 0
ThirdParty/lib/PocoCrypto.lib → ThirdParty/lib/Debug/PocoCrypto.lib


+ 0 - 0
ThirdParty/lib/PocoData.dll → ThirdParty/lib/Debug/PocoData.dll


+ 0 - 0
ThirdParty/lib/PocoDataODBC.dll → ThirdParty/lib/Debug/PocoDataODBC.dll


+ 0 - 0
ThirdParty/lib/PocoDataSQLite.dll → ThirdParty/lib/Debug/PocoDataSQLite.dll


+ 0 - 0
ThirdParty/lib/PocoEncodings.dll → ThirdParty/lib/Debug/PocoEncodings.dll


+ 0 - 0
ThirdParty/lib/PocoFoundation.dll → ThirdParty/lib/Debug/PocoFoundation.dll


+ 0 - 0
ThirdParty/lib/PocoFoundation.lib → ThirdParty/lib/Debug/PocoFoundation.lib


+ 0 - 0
ThirdParty/lib/PocoJSON.dll → ThirdParty/lib/Debug/PocoJSON.dll


+ 0 - 0
ThirdParty/lib/PocoJSON.lib → ThirdParty/lib/Debug/PocoJSON.lib


+ 0 - 0
ThirdParty/lib/PocoMongoDB.dll → ThirdParty/lib/Debug/PocoMongoDB.dll


+ 0 - 0
ThirdParty/lib/PocoNet.dll → ThirdParty/lib/Debug/PocoNet.dll


+ 0 - 0
ThirdParty/lib/PocoNet.lib → ThirdParty/lib/Debug/PocoNet.lib


+ 0 - 0
ThirdParty/lib/PocoNetSSL.dll → ThirdParty/lib/Debug/PocoNetSSL.dll


+ 0 - 0
ThirdParty/lib/PocoNetSSL.lib → ThirdParty/lib/Debug/PocoNetSSL.lib


+ 0 - 0
ThirdParty/lib/PocoRedis.dll → ThirdParty/lib/Debug/PocoRedis.dll


+ 0 - 0
ThirdParty/lib/PocoUtil.dll → ThirdParty/lib/Debug/PocoUtil.dll


+ 0 - 0
ThirdParty/lib/PocoUtil.lib → ThirdParty/lib/Debug/PocoUtil.lib


+ 0 - 0
ThirdParty/lib/PocoXML.dll → ThirdParty/lib/Debug/PocoXML.dll


+ 0 - 0
ThirdParty/lib/PocoXML.lib → ThirdParty/lib/Debug/PocoXML.lib


BIN
ThirdParty/lib/Debug/cossdk.lib


BIN
ThirdParty/lib/Debug/libcrypto-1_1.dll


BIN
ThirdParty/lib/Debug/libcrypto.lib


BIN
ThirdParty/lib/Debug/libssl-1_1.dll


BIN
ThirdParty/lib/Debug/libssl.lib


BIN
ThirdParty/lib/Debug/openssl.lib


BIN
ThirdParty/lib/Release/PocoCrypto.dll


BIN
ThirdParty/lib/Release/PocoCrypto.lib


BIN
ThirdParty/lib/Release/PocoData.dll


BIN
ThirdParty/lib/Release/PocoDataODBC.dll


BIN
ThirdParty/lib/Release/PocoDataSQLite.dll


BIN
ThirdParty/lib/Release/PocoEncodings.dll


BIN
ThirdParty/lib/Release/PocoFoundation.dll


BIN
ThirdParty/lib/Release/PocoFoundation.lib


BIN
ThirdParty/lib/Release/PocoJSON.dll


BIN
ThirdParty/lib/Release/PocoJSON.lib


BIN
ThirdParty/lib/Release/PocoMongoDB.dll


BIN
ThirdParty/lib/Release/PocoNet.dll


BIN
ThirdParty/lib/Release/PocoNet.lib


BIN
ThirdParty/lib/Release/PocoNetSSL.dll


BIN
ThirdParty/lib/Release/PocoNetSSL.lib


BIN
ThirdParty/lib/Release/PocoRedis.dll


BIN
ThirdParty/lib/Release/PocoUtil.dll


BIN
ThirdParty/lib/Release/PocoUtil.lib


BIN
ThirdParty/lib/Release/PocoXML.dll


BIN
ThirdParty/lib/Release/PocoXML.lib


+ 0 - 0
ThirdParty/lib/cossdk.lib → ThirdParty/lib/Release/cossdk.lib


+ 6 - 2
UCloudSDK/UCloudSDK.vcxproj

@@ -26,7 +26,7 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
@@ -93,7 +93,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalDependencies>cossdk.lib;PocoNetSSL.lib;PocoNet.lib;PocoCrypto.lib;PocoUtil.lib;PocoJSON.lib;PocoXML.lib;PocoFoundation.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>../ThirdParty/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>../ThirdParty/lib/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalOptions>%(AdditionalOptions) /machine:X86</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
@@ -104,9 +104,13 @@
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
       <AdditionalIncludeDirectories>..\ThirdParty\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
+      <AdditionalLibraryDirectories>../ThirdParty/lib/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>cossdk.lib;PocoNetSSL.lib;PocoNet.lib;PocoCrypto.lib;PocoUtil.lib;PocoJSON.lib;PocoXML.lib;PocoFoundation.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalOptions>%(AdditionalOptions) /machine:X86</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">