From 6485e33018338315b91175e7e209a4749af4d820 Mon Sep 17 00:00:00 2001
From: Apex Liu <apex.liu@qq.com>
Date: Tue, 18 Sep 2018 02:46:41 +0800
Subject: [PATCH] compile on windows.

---
 external/libssh-win-static/include/config.h   | 21 +++++++++----------
 external/version.ini                          | 10 ++++-----
 server/tp_core/core/tp_core.vs2015.vcxproj    |  1 +
 .../core/tp_core.vs2015.vcxproj.filters       |  3 +++
 .../protocol/telnet/tptelnet.vs2015.vcxproj   |  2 +-
 .../telnet/tptelnet.vs2015.vcxproj.filters    |  6 +++---
 6 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/external/libssh-win-static/include/config.h b/external/libssh-win-static/include/config.h
index d4643f5..b18c7e1 100644
--- a/external/libssh-win-static/include/config.h
+++ b/external/libssh-win-static/include/config.h
@@ -6,15 +6,15 @@
 #define PACKAGE "libssh"
 
 /* Version number of package */
-#define VERSION "0.7.4"
+#define VERSION "0.7.5"
 
 /* #undef LOCALEDIR */
 /* #undef DATADIR */
 //#define LIBDIR "lib"
 //#define PLUGINDIR "plugins-4"
 /* #undef SYSCONFDIR */
-//#define BINARYDIR "E:/work/eomsoft/tmp/libssh/build"
-//#define SOURCEDIR "E:/work/eomsoft/tmp/libssh"
+//#define BINARYDIR "E:/work/tp4a/teleport/external/_download_/libssh-0.7.5/build"
+//#define SOURCEDIR "E:/work/tp4a/teleport/external/_download_/libssh-0.7.5"
 
 /************************** HEADER FILES *************************/
 
@@ -81,28 +81,28 @@
 /*************************** FUNCTIONS ***************************/
 
 /* Define to 1 if you have the `EVP_aes128_ctr' function. */
-#define HAVE_OPENSSL_EVP_AES_CTR 1
+//#define HAVE_OPENSSL_EVP_AES_CTR 1
 
 /* Define to 1 if you have the `EVP_aes128_cbc' function. */
-#define HAVE_OPENSSL_EVP_AES_CBC 1
+//#define HAVE_OPENSSL_EVP_AES_CBC 1
 
 /* Define to 1 if you have the `snprintf' function. */
 #define HAVE_SNPRINTF 1
 
 /* Define to 1 if you have the `_snprintf' function. */
-/* #undef HAVE__SNPRINTF */
+#define HAVE__SNPRINTF 1
 
 /* Define to 1 if you have the `_snprintf_s' function. */
-/* #undef HAVE__SNPRINTF_S */
+#define HAVE__SNPRINTF_S 1
 
 /* Define to 1 if you have the `vsnprintf' function. */
 #define HAVE_VSNPRINTF 1
 
 /* Define to 1 if you have the `_vsnprintf' function. */
-/* #undef HAVE__VSNPRINTF */
+#define HAVE__VSNPRINTF 1
 
 /* Define to 1 if you have the `_vsnprintf_s' function. */
-/* #undef HAVE__VSNPRINTF_S */
+#define HAVE__VSNPRINTF_S 1
 
 /* Define to 1 if you have the `isblank' function. */
 #define HAVE_ISBLANK 1
@@ -172,8 +172,7 @@
 #define WITH_SFTP 1
 
 /* Define to 1 if you want to enable SSH1 */
-/* #undef WITH_SSH1 */
-#define WITH_SSH1
+#define WITH_SSH1 1
 
 /* Define to 1 if you want to enable server support */
 #define WITH_SERVER 1
diff --git a/external/version.ini b/external/version.ini
index 544e6fb..d9486fc 100644
--- a/external/version.ini
+++ b/external/version.ini
@@ -1,9 +1,9 @@
 [external_ver]
-openssl = 1.0.2h,1000208f
-libuv = 1.18.0
-mbedtls = 2.6.1
-sqlite = 3170000
+openssl = 1.0.2p,1000210f
+libuv = 1.23.0
+mbedtls = 2.12.0
+sqlite = 3250000
 libssh = 0.7.5
 jsoncpp = 0.10.6
-mongoose = 6.10
+mongoose = 6.12
 
diff --git a/server/tp_core/core/tp_core.vs2015.vcxproj b/server/tp_core/core/tp_core.vs2015.vcxproj
index c0b36b9..fdcdae2 100644
--- a/server/tp_core/core/tp_core.vs2015.vcxproj
+++ b/server/tp_core/core/tp_core.vs2015.vcxproj
@@ -181,6 +181,7 @@
     <ClCompile Include="..\..\..\external\jsoncpp\src\lib_json\json_writer.cpp" />
     <ClCompile Include="..\..\..\external\mbedtls\library\aes.c" />
     <ClCompile Include="..\..\..\external\mbedtls\library\base64.c" />
+    <ClCompile Include="..\..\..\external\mbedtls\library\platform_util.c" />
     <ClCompile Include="..\..\..\external\mbedtls\library\sha1.c" />
     <ClCompile Include="..\..\..\external\mongoose\mongoose.c" />
     <ClCompile Include="main.cpp" />
diff --git a/server/tp_core/core/tp_core.vs2015.vcxproj.filters b/server/tp_core/core/tp_core.vs2015.vcxproj.filters
index 4014d60..3d67ae0 100644
--- a/server/tp_core/core/tp_core.vs2015.vcxproj.filters
+++ b/server/tp_core/core/tp_core.vs2015.vcxproj.filters
@@ -109,6 +109,9 @@
     <ClCompile Include="tp_tpp_mgr.cpp">
       <Filter>main app</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\external\mbedtls\library\platform_util.c">
+      <Filter>mbedtls\library</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="ts_main.h">
diff --git a/server/tp_core/protocol/telnet/tptelnet.vs2015.vcxproj b/server/tp_core/protocol/telnet/tptelnet.vs2015.vcxproj
index 01fa189..a5f9255 100644
--- a/server/tp_core/protocol/telnet/tptelnet.vs2015.vcxproj
+++ b/server/tp_core/protocol/telnet/tptelnet.vs2015.vcxproj
@@ -142,6 +142,7 @@
     <ClCompile Include="..\..\..\..\external\libuv\src\fs-poll.c" />
     <ClCompile Include="..\..\..\..\external\libuv\src\inet.c" />
     <ClCompile Include="..\..\..\..\external\libuv\src\threadpool.c" />
+    <ClCompile Include="..\..\..\..\external\libuv\src\timer.c" />
     <ClCompile Include="..\..\..\..\external\libuv\src\uv-common.c" />
     <ClCompile Include="..\..\..\..\external\libuv\src\version.c" />
     <ClCompile Include="..\..\..\..\external\libuv\src\win\async.c" />
@@ -165,7 +166,6 @@
     <ClCompile Include="..\..\..\..\external\libuv\src\win\stream.c" />
     <ClCompile Include="..\..\..\..\external\libuv\src\win\tcp.c" />
     <ClCompile Include="..\..\..\..\external\libuv\src\win\thread.c" />
-    <ClCompile Include="..\..\..\..\external\libuv\src\win\timer.c" />
     <ClCompile Include="..\..\..\..\external\libuv\src\win\tty.c" />
     <ClCompile Include="..\..\..\..\external\libuv\src\win\udp.c" />
     <ClCompile Include="..\..\..\..\external\libuv\src\win\util.c" />
diff --git a/server/tp_core/protocol/telnet/tptelnet.vs2015.vcxproj.filters b/server/tp_core/protocol/telnet/tptelnet.vs2015.vcxproj.filters
index b48feb8..cbac275 100644
--- a/server/tp_core/protocol/telnet/tptelnet.vs2015.vcxproj.filters
+++ b/server/tp_core/protocol/telnet/tptelnet.vs2015.vcxproj.filters
@@ -244,9 +244,6 @@
     <ClCompile Include="..\..\..\..\external\libuv\src\win\thread.c">
       <Filter>libuv\src\win</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\external\libuv\src\win\timer.c">
-      <Filter>libuv\src\win</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\external\libuv\src\win\tty.c">
       <Filter>libuv\src\win</Filter>
     </ClCompile>
@@ -316,5 +313,8 @@
     <ClCompile Include="..\..\..\..\external\jsoncpp\src\lib_json\json_value.cpp">
       <Filter>jsoncpp</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\external\libuv\src\timer.c">
+      <Filter>libuv\src\win</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file