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

Replacing CryptoPP with PolarSSL.

Browse Source 
This is only the CMake modification to build with PolarSSL, the actual MCS code doesn't compile at all yet.
This commit is contained in:
madmaxoft 2014-01-22 22:19:33 +01:00
parent 37e820d16e
commit eb9bebf755
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -183,7 +183,6 @@ project (MCServer)
# Include all the libraries: # Include all the libraries:
add_subdirectory(lib/inifile/) add_subdirectory(lib/inifile/)
add_subdirectory(lib/jsoncpp/) add_subdirectory(lib/jsoncpp/)
add_subdirectory(lib/cryptopp/)
add_subdirectory(lib/zlib/) add_subdirectory(lib/zlib/)
add_subdirectory(lib/lua/) add_subdirectory(lib/lua/)
add_subdirectory(lib/tolua++/) add_subdirectory(lib/tolua++/)
@ -192,6 +191,12 @@ add_subdirectory(lib/expat/)
add_subdirectory(lib/luaexpat/) add_subdirectory(lib/luaexpat/)
add_subdirectory(lib/md5/) add_subdirectory(lib/md5/)
# We use EXCLUDE_FROM_ALL so that only the explicit dependencies are used
# (PolarSSL also has test and example programs in their CMakeLists.txt, we don't want those)
add_subdirectory(lib/polarssl/ EXCLUDE_FROM_ALL)
# Remove disabling the maximum warning level: # Remove disabling the maximum warning level:
# clang does not like a command line that reads -Wall -Wextra -w -Wall -Wextra and does not output any warnings # clang does not like a command line that reads -Wall -Wextra -w -Wall -Wextra and does not output any warnings
# We do not do that for MSVC since MSVC produces an awful lot of warnings for its own STL headers; # We do not do that for MSVC since MSVC produces an awful lot of warnings for its own STL headers;

2
src/CMakeLists.txt
View File

@ -120,4 +120,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} md5 luaexpat iniFile jsoncpp cryptopp zlib lua sqlite) target_link_libraries(${EXECUTABLE} md5 luaexpat iniFile jsoncpp polarssl zlib lua sqlite)