Merge pull request #1880 from mc-server/submodules

Update submodules
This commit is contained in:
Mattes D
2015-05-03 00:03:07 +02:00
8 changed files with 8 additions and 8 deletions
+1 -1
View File
@@ -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()
+1 -1
View File
@@ -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)
+1 -1
View File
@@ -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()