Merge branch 'master' of https://github.com/netease-im/NIM_PC_Demo

Author: haokui01

app_sdk/app_sdk.vcxproj

@@ -119,7 +119,8 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
     <Lib>
-      <AdditionalDependencies>cpp_wrapper_util_d.lib;nim_sdk_cpp_wrapper_dll_d.lib;nim_chatroom_sdk_cpp_wrapper_dll_d.lib</AdditionalDependencies>
+      <AdditionalDependencies>
+      </AdditionalDependencies>
     </Lib>
     <Lib>
       <AdditionalLibraryDirectories>../libs/x64/;../nim_sdk/bin/x64_dlls/;../nim_sdk/libs/x64/mt/</AdditionalLibraryDirectories>

nim_win_demo/nim.sln

@@ -223,12 +223,14 @@ Global
 		{9E545944-C56C-41C0-9DFC-CD66368A15E8}.Debug|Win32.ActiveCfg = Debug|Win32
 		{9E545944-C56C-41C0-9DFC-CD66368A15E8}.Debug|Win32.Build.0 = Debug|Win32
 		{9E545944-C56C-41C0-9DFC-CD66368A15E8}.Debug|x64.ActiveCfg = Debug|x64
+		{9E545944-C56C-41C0-9DFC-CD66368A15E8}.Debug|x64.Build.0 = Debug|x64
 		{9E545944-C56C-41C0-9DFC-CD66368A15E8}.Release|Win32.ActiveCfg = Release|Win32
 		{9E545944-C56C-41C0-9DFC-CD66368A15E8}.Release|Win32.Build.0 = Release|Win32
 		{9E545944-C56C-41C0-9DFC-CD66368A15E8}.Release|x64.ActiveCfg = Release|x64
 		{F0DC120D-3448-4D53-AE53-57AA0903DB89}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F0DC120D-3448-4D53-AE53-57AA0903DB89}.Debug|Win32.Build.0 = Debug|Win32
 		{F0DC120D-3448-4D53-AE53-57AA0903DB89}.Debug|x64.ActiveCfg = Debug|x64
+		{F0DC120D-3448-4D53-AE53-57AA0903DB89}.Debug|x64.Build.0 = Debug|x64
 		{F0DC120D-3448-4D53-AE53-57AA0903DB89}.Release|Win32.ActiveCfg = Release|Win32
 		{F0DC120D-3448-4D53-AE53-57AA0903DB89}.Release|Win32.Build.0 = Release|Win32
 		{F0DC120D-3448-4D53-AE53-57AA0903DB89}.Release|x64.ActiveCfg = Release|x64
@@ -241,6 +243,7 @@ Global
 		{C98EB0BC-77D8-42A2-95B0-FB1445F86BE5}.Debug|Win32.ActiveCfg = Debug|Win32
 		{C98EB0BC-77D8-42A2-95B0-FB1445F86BE5}.Debug|Win32.Build.0 = Debug|Win32
 		{C98EB0BC-77D8-42A2-95B0-FB1445F86BE5}.Debug|x64.ActiveCfg = Debug|x64
+		{C98EB0BC-77D8-42A2-95B0-FB1445F86BE5}.Debug|x64.Build.0 = Debug|x64
 		{C98EB0BC-77D8-42A2-95B0-FB1445F86BE5}.Release|Win32.ActiveCfg = Release|Win32
 		{C98EB0BC-77D8-42A2-95B0-FB1445F86BE5}.Release|Win32.Build.0 = Release|Win32
 		{C98EB0BC-77D8-42A2-95B0-FB1445F86BE5}.Release|x64.ActiveCfg = Release|x64

nim_win_demo/nim.vcxproj

@@ -121,7 +121,7 @@
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;__WINDOWS__;__x86_64__;__SUPPORT_XP__;WITH_ENCRYPT;TIXML_USE_STL;NIM_SDK_DLL_IMPORT;NIM_WIN_DESKTOP_ONLY_SDK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <AdditionalIncludeDirectories>.\;..\;..\tool_kits\;..\tool_kits\cef\cef_module;..\tool_kits\cef\cef_wrapper\;..\tool_kits\ui_component\;..\tool_kits\ui_component\ui_kit\;..\tool_kits\ui_component\nim_service\;..\third_party\;..\third_party\openssl\include\;..\third_party\jsoncpp\include\;..\third_party\crypto++\cryptopp\;..\libs\nim_p2p_sdk\;..\libs\nim_p2p_sdk\src\;..\chatroom\;..\app_sdk\include;$(ProjectDir)../nim_sdk/;$(ProjectDir)../sdk/nim_sdk/depend_lib/src/jsoncpp/include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <TreatWarningAsError>true</TreatWarningAsError>
+      <TreatWarningAsError>false</TreatWarningAsError>
       <DisableSpecificWarnings>4100;4121;4127;4244;4310;4355;4481;4505;4512;4702;4251;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
       <AdditionalOptions>/Zm150 %(AdditionalOptions)</AdditionalOptions>
@@ -130,9 +130,10 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>..\libs\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>dbghelp.lib;libyuv_d.lib;libssld.lib;libcryptod.lib;custom_app_sdk_d.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>dbghelp.lib;libyuv_d.lib;libssld.lib;libcryptod.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <DelayLoadDLLs>nim_libcef.dll;libEGL.dll;libGLESv2.dll</DelayLoadDLLs>
-      <IgnoreSpecificDefaultLibraries>LIBCMTD.lib;LIBCMT.lib</IgnoreSpecificDefaultLibraries>
+      <IgnoreSpecificDefaultLibraries>
+      </IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -283,6 +284,15 @@
     <ProjectReference Include="..\chatroom\chatroom.vcxproj">
       <Project>{31e319ba-3b1c-4888-aafb-502d7d351aa1}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\nim_sdk\src\cpp_sdk\depend_lib\src\cpp_wrapper_util\cpp_wrapper_util_mt.vcxproj">
+      <Project>{c98eb0bc-77d8-42a2-95b0-fb1445f86be5}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\nim_sdk\src\cpp_sdk\nim\nim_sdk_cpp_wrapper_lib_mt.vcxproj">
+      <Project>{9e545944-c56c-41c0-9dfc-cd66368a15e8}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\nim_sdk\src\cpp_sdk\nim_chatroom\nim_chatroom_sdk_cpp_wrapper_lib_mt.vcxproj">
+      <Project>{f0dc120d-3448-4d53-ae53-57aa0903db89}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\tool_kits\base\base.vcxproj">
       <Project>{8d9a6595-717a-41c8-b468-0011a72be3d1}</Project>
     </ProjectReference>

tool_kits/ui_component/nim_service/nim_service.vcxproj

@@ -125,7 +125,7 @@
       <AdditionalLibraryDirectories>..\..\..\libs\;..\..\..\bin\;</AdditionalLibraryDirectories>
     </Link>
     <Lib>
-      <AdditionalDependencies>vfw32.lib;jsoncpp_d.lib;tinyxml_d.lib;wxsqlite3_d.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\..\..\libs\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Lib>
   </ItemDefinitionGroup>