summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2014-04-24 21:51:39 +0200
committermadmaxoft <github@xoft.cz>2014-04-24 21:53:42 +0200
commite33573ab59fefb76c1d01910f49428d808992b2b (patch)
tree37ff01a0c38c3135c6d9a6f4c93672aa7b2b0898
parentAuthenticator uses some C++ SSL objects. (diff)
downloadcuberite-e33573ab59fefb76c1d01910f49428d808992b2b.tar
cuberite-e33573ab59fefb76c1d01910f49428d808992b2b.tar.gz
cuberite-e33573ab59fefb76c1d01910f49428d808992b2b.tar.bz2
cuberite-e33573ab59fefb76c1d01910f49428d808992b2b.tar.lz
cuberite-e33573ab59fefb76c1d01910f49428d808992b2b.tar.xz
cuberite-e33573ab59fefb76c1d01910f49428d808992b2b.tar.zst
cuberite-e33573ab59fefb76c1d01910f49428d808992b2b.zip
Diffstat (limited to '')
-rw-r--r--src/CMakeLists.txt4
-rw-r--r--src/PolarSSL++/CMakeLists.txt17
2 files changed, 19 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 30e9dbfd4..67bb299db 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -5,7 +5,7 @@ include_directories (SYSTEM "${PROJECT_SOURCE_DIR}/../lib/")
include_directories (SYSTEM "${PROJECT_SOURCE_DIR}/../lib/jsoncpp/include")
include_directories (SYSTEM "${PROJECT_SOURCE_DIR}/../lib/polarssl/include")
-set(FOLDERS OSSupport HTTPServer Items Blocks Protocol Generating)
+set(FOLDERS OSSupport HTTPServer Items Blocks Protocol Generating PolarSSL++)
set(FOLDERS ${FOLDERS} WorldStorage Mobs Entities Simulator UI BlockEntities Generating/Prefabs)
@@ -233,7 +233,7 @@ endif ()
if (NOT MSVC)
target_link_libraries(${EXECUTABLE} OSSupport HTTPServer Bindings Items Blocks)
target_link_libraries(${EXECUTABLE} Protocol Generating Generating_Prefabs WorldStorage)
- target_link_libraries(${EXECUTABLE} Mobs Entities Simulator UI BlockEntities)
+ target_link_libraries(${EXECUTABLE} Mobs Entities Simulator UI BlockEntities PolarSSL++)
endif ()
if (WIN32)
target_link_libraries(${EXECUTABLE} expat tolualib ws2_32.lib Psapi.lib)
diff --git a/src/PolarSSL++/CMakeLists.txt b/src/PolarSSL++/CMakeLists.txt
new file mode 100644
index 000000000..4f954a7e5
--- /dev/null
+++ b/src/PolarSSL++/CMakeLists.txt
@@ -0,0 +1,17 @@
+
+cmake_minimum_required (VERSION 2.6)
+project (MCServer)
+
+include_directories ("${PROJECT_SOURCE_DIR}/../")
+
+set(SOURCES
+ "EntropyContext.cpp"
+ "CtrDrbgContext.cpp"
+ "x509Cert.cpp"
+)
+
+add_library(PolarSSL++ ${SOURCES})
+
+if (UNIX)
+ target_link_libraries(PolarSSL++ polarssl)
+endif()