flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge pull request #1880 from mc-server/submodules

Browse Source 
Update submodules
This commit is contained in:
Mattes D 2015-05-03 00:03:07 +02:00
commit e6eeee84e0
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MCServer/Plugins/Core

@ -1 +1 @@
Subproject commit 57a0bda7d3d8feaa21108e030e994575f9e295fa Subproject commit ea0ab964d568630fd4f2b52954186f2851a769e1

2
Tools/ProtoProxy/CMakeLists.txt
View File

@ -105,5 +105,5 @@ add_executable(ProtoProxy
${SHARED_OSS_HDR} ${SHARED_OSS_HDR}
) )
target_link_libraries(ProtoProxy zlib polarssl) target_link_libraries(ProtoProxy zlib mbedtls)

2
lib/SQLiteCpp

@ -1 +1 @@
Subproject commit 55edadd56d0d6f506954ad00c3b9a5d425814a2f Subproject commit b17195b8d03e8908807c51f4d6ce610b148fc1b2

2
lib/libevent

@ -1 +1 @@
Subproject commit 62eaa889cc1996a7c58a389bf2dfa5d8ce784bdb Subproject commit de2bb6568c930f76a5bc41ef6e0bf35a8a826e67

2
lib/polarssl

@ -1 +1 @@
Subproject commit 38f47a8546b55e2b593bba27f03070e1e82d3c84 Subproject commit 4f4c5b7450631e46a94cb89adf4a7737fbb178bc

2
src/Bindings/CMakeLists.txt
View File

@ -142,5 +142,5 @@ set_source_files_properties(${CMAKE_SOURCE_DIR}/src/Bindings/Bindings.cpp PROPER
if(NOT MSVC) if(NOT MSVC)
add_library(Bindings ${SRCS} ${HDRS}) add_library(Bindings ${SRCS} ${HDRS})
target_link_libraries(Bindings lua sqlite tolualib polarssl) target_link_libraries(Bindings lua sqlite tolualib mbedtls)
endif() endif()

2
src/CMakeLists.txt
View File

@ -324,4 +324,4 @@ endif ()
if (WIN32) if (WIN32)
target_link_libraries(${EXECUTABLE} expat tolualib ws2_32.lib Psapi.lib) target_link_libraries(${EXECUTABLE} expat tolualib ws2_32.lib Psapi.lib)
endif() 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)

2
src/PolarSSL++/CMakeLists.txt
View File

@ -37,6 +37,6 @@ if(NOT MSVC)
add_library(PolarSSL++ ${SRCS} ${HDRS}) add_library(PolarSSL++ ${SRCS} ${HDRS})
if (UNIX) if (UNIX)
target_link_libraries(PolarSSL++ polarssl) target_link_libraries(PolarSSL++ mbedtls)
endif() endif()
endif() endif()