diff options
| author | Mattes D <github@xoft.cz> | 2015-05-03 00:03:07 +0200 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2015-05-03 00:03:07 +0200 |
| commit | e6eeee84e014568ffbfa69f4209aee067d2ec763 (patch) | |
| tree | 4bfc2ef5d18b34d1a53f5516ae8fc7ea9c1f5461 | |
| parent | Fixed error in webadmin home page (diff) | |
| parent | Update submodules (diff) | |
| download | cuberite-e6eeee84e014568ffbfa69f4209aee067d2ec763.tar cuberite-e6eeee84e014568ffbfa69f4209aee067d2ec763.tar.gz cuberite-e6eeee84e014568ffbfa69f4209aee067d2ec763.tar.bz2 cuberite-e6eeee84e014568ffbfa69f4209aee067d2ec763.tar.lz cuberite-e6eeee84e014568ffbfa69f4209aee067d2ec763.tar.xz cuberite-e6eeee84e014568ffbfa69f4209aee067d2ec763.tar.zst cuberite-e6eeee84e014568ffbfa69f4209aee067d2ec763.zip | |
| m--------- | MCServer/Plugins/Core | 0 | ||||
| -rw-r--r-- | Tools/ProtoProxy/CMakeLists.txt | 2 | ||||
| m--------- | lib/SQLiteCpp | 0 | ||||
| m--------- | lib/libevent | 0 | ||||
| m--------- | lib/polarssl | 0 | ||||
| -rw-r--r-- | src/Bindings/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/PolarSSL++/CMakeLists.txt | 2 |
8 files changed, 4 insertions, 4 deletions
diff --git a/MCServer/Plugins/Core b/MCServer/Plugins/Core -Subproject 57a0bda7d3d8feaa21108e030e994575f9e295f +Subproject ea0ab964d568630fd4f2b52954186f2851a769e 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 -Subproject 55edadd56d0d6f506954ad00c3b9a5d425814a2 +Subproject b17195b8d03e8908807c51f4d6ce610b148fc1b diff --git a/lib/libevent b/lib/libevent -Subproject 62eaa889cc1996a7c58a389bf2dfa5d8ce784bd +Subproject de2bb6568c930f76a5bc41ef6e0bf35a8a826e6 diff --git a/lib/polarssl b/lib/polarssl -Subproject 38f47a8546b55e2b593bba27f03070e1e82d3c8 +Subproject 4f4c5b7450631e46a94cb89adf4a7737fbb178b 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() |