From 2919d08883bbf84f80368bd542da44a8147f1901 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Sat, 2 May 2015 15:57:49 +0100 Subject: Update submodules --- MCServer/Plugins/Core | 2 +- Tools/ProtoProxy/CMakeLists.txt | 2 +- lib/SQLiteCpp | 2 +- lib/libevent | 2 +- lib/polarssl | 2 +- src/Bindings/CMakeLists.txt | 2 +- src/CMakeLists.txt | 2 +- src/PolarSSL++/CMakeLists.txt | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/MCServer/Plugins/Core b/MCServer/Plugins/Core index 57a0bda7d..ea0ab964d 160000 --- a/MCServer/Plugins/Core +++ b/MCServer/Plugins/Core @@ -1 +1 @@ -Subproject commit 57a0bda7d3d8feaa21108e030e994575f9e295fa +Subproject commit ea0ab964d568630fd4f2b52954186f2851a769e1 diff --git a/Tools/ProtoProxy/CMakeLists.txt b/Tools/ProtoProxy/CMakeLists.txt index 132a14f78..ce64db38d 100644 --- a/Tools/ProtoProxy/CMakeLists.txt +++ b/Tools/ProtoProxy/CMakeLists.txt @@ -105,5 +105,5 @@ add_executable(ProtoProxy ${SHARED_OSS_HDR} ) -target_link_libraries(ProtoProxy zlib polarssl) +target_link_libraries(ProtoProxy zlib mbedtls) diff --git a/lib/SQLiteCpp b/lib/SQLiteCpp index 55edadd56..b17195b8d 160000 --- a/lib/SQLiteCpp +++ b/lib/SQLiteCpp @@ -1 +1 @@ -Subproject commit 55edadd56d0d6f506954ad00c3b9a5d425814a2f +Subproject commit b17195b8d03e8908807c51f4d6ce610b148fc1b2 diff --git a/lib/libevent b/lib/libevent index 62eaa889c..de2bb6568 160000 --- a/lib/libevent +++ b/lib/libevent @@ -1 +1 @@ -Subproject commit 62eaa889cc1996a7c58a389bf2dfa5d8ce784bdb +Subproject commit de2bb6568c930f76a5bc41ef6e0bf35a8a826e67 diff --git a/lib/polarssl b/lib/polarssl index 38f47a854..4f4c5b745 160000 --- a/lib/polarssl +++ b/lib/polarssl @@ -1 +1 @@ -Subproject commit 38f47a8546b55e2b593bba27f03070e1e82d3c84 +Subproject commit 4f4c5b7450631e46a94cb89adf4a7737fbb178bc diff --git a/src/Bindings/CMakeLists.txt b/src/Bindings/CMakeLists.txt index 4cc73b350..366284fcb 100644 --- a/src/Bindings/CMakeLists.txt +++ b/src/Bindings/CMakeLists.txt @@ -142,5 +142,5 @@ set_source_files_properties(${CMAKE_SOURCE_DIR}/src/Bindings/Bindings.cpp PROPER if(NOT MSVC) add_library(Bindings ${SRCS} ${HDRS}) - target_link_libraries(Bindings lua sqlite tolualib polarssl) + target_link_libraries(Bindings lua sqlite tolualib mbedtls) endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b91c4f65a..e04e6311f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -324,4 +324,4 @@ endif () if (WIN32) target_link_libraries(${EXECUTABLE} expat tolualib ws2_32.lib Psapi.lib) endif() -target_link_libraries(${EXECUTABLE} luaexpat jsoncpp polarssl zlib sqlite lua SQLiteCpp event_core event_extra) +target_link_libraries(${EXECUTABLE} luaexpat jsoncpp mbedtls zlib sqlite lua SQLiteCpp event_core event_extra) diff --git a/src/PolarSSL++/CMakeLists.txt b/src/PolarSSL++/CMakeLists.txt index 39d41292d..b11d16e33 100644 --- a/src/PolarSSL++/CMakeLists.txt +++ b/src/PolarSSL++/CMakeLists.txt @@ -37,6 +37,6 @@ if(NOT MSVC) add_library(PolarSSL++ ${SRCS} ${HDRS}) if (UNIX) - target_link_libraries(PolarSSL++ polarssl) + target_link_libraries(PolarSSL++ mbedtls) endif() endif() -- cgit v1.2.3