Add target configurations from the sln to the root-level cmake project

(cherry picked from commit 4b594c6e2e)

CMakeLists.txt

@@ -1,26 +1,44 @@
-project(CyanWorldsEngine)
+project(CyanWorldsEngine)
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8)
-
+
-# Find all 3rd-party libraries that are required
+# Find all 3rd-party libraries that are required
-find_package(OpenSSL REQUIRED)
+find_package(OpenSSL REQUIRED)
-find_package(OpenAL REQUIRED)
+find_package(OpenAL REQUIRED)
-
+
-option(EXTERNAL_RELEASE "Is this release intended for the general public?" OFF)
+option(EXTERNAL_RELEASE "Is this release intended for the general public?" OFF)
-
+
-# TODO: are there any other build types which are useful for us?
+#TODO: Don't hard code this
-add_definitions(-DBUILD_TYPE_LIVE)
+add_definitions(-DBUILD_TYPE=BUILD_TYPE_LIVE)
-
+
-if(EXTERNAL_RELEASE)
+if(EXTERNAL_RELEASE)
-	add_definitions(-DPLASMA_EXTERNAL_RELEASE)
+	add_definitions(-DPLASMA_EXTERNAL_RELEASE)
-endif(EXTERNAL_RELEASE)
+endif(EXTERNAL_RELEASE)
-
+
-if(CMAKE_BUILD_TYPE STREQUAL Debug)
+set(PLASMA_TARGETS Client
-	add_definitions(-D_DEBUG)
+    CACHE STRING "Which set of plasma targets to build and use")
-endif(CMAKE_BUILD_TYPE STREQUAL Debug)
+set_property(CACHE PLASMA_TARGETS PROPERTY STRINGS
-
+             "Client" "Server" "Patcher" "Ethereal" "NoAvMsgs")
-if(MSVC)
+
-	add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+if(PLASMA_TARGETS STREQUAL "Patcher")
-endif(MSVC)
+	add_definitions(-DPATCHER)
-
+endif(PLASMA_TARGETS STREQUAL "Patcher")
-add_subdirectory(Sources/Plasma)
+
-# add_subdirectory(Sources/Tools)
+if(PLASMA_TARGETS STREQUAL "Server")
+	add_definitions(-DSERVER)
+endif(PLASMA_TARGETS STREQUAL "Server")
+
+if(PLASMA_TARGETS STREQUAL "NoAvMsgs")
+	add_definitions(-DNO_AV_MSGS)
+endif(PLASMA_TARGETS STREQUAL "NoAvMsgs")
+
+if(PLASMA_TARGETS STREQUAL "Ethereal")
+	add_definitions(-DSTREAM_LOGGER)
+endif(PLASMA_TARGETS STREQUAL "Ethereal")
+
+if(MSVC)
+	add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+	add_definitions(-D_SCL_SECURE_NO_WARNINGS)
+endif(MSVC)
+
+add_subdirectory(Sources/Plasma)
+# add_subdirectory(Sources/Tools)

Sources/Plasma/PubUtilLib/plEncryption/plChecksum.h

@@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #define PL_CHECKSUM_H
 
 #include "hsTypes.h"
-#include "openssl/md5.h"
+#include <openssl/md5.h>
 
 class plChecksum
 {