Merge branch 'billy1arm-master'

CMakeLists.txt

@@ -40,6 +40,7 @@ option(BUILD_REALMD         "Build the login server"                        ON)
 option(BUILD_TOOLS          "Build the map/vmap/mmap extractors"            ON)
 option(SCRIPT_LIB_ELUNA     "Compile with support for Eluna scripts"        ON)
 option(SCRIPT_LIB_SD3       "Compile with support for ScriptDev3 scripts"   ON)
+#option(PLAYERBOTS           "Enable Player Bots"                            OFF)
 option(SOAP                 "Enable remote access via SOAP"                 OFF)
 # Hidden option to enable/disable PCH. DEV ONLY!
 set(PCH ON)
@@ -61,7 +62,8 @@ message(
    Scripting engines:
     SCRIPT_LIB_ELUNA        Compile with support for Eluna scripts
     SCRIPT_LIB_SD3          Compile with support for ScriptDev3 scripts
-
+   Modules:
+    PLAYERBOTS              Enable Player Bots
   To set an option simply type -D<OPTION>=<VALUE> after 'cmake <srcs>'.
   Also, you can specify the generator with -G. see 'cmake --help' for more details
   For example: cmake .. -DDEBUG=1 -DCMAKE_INSTALL_PREFIX=/opt/mangos
@@ -134,6 +136,13 @@ else()
     message(STATUS "Script engine SD3     : No")
 endif()
 
+#if(PLAYERBOTS)
+#    message(STATUS "Enable Player Bots    : Yes (default)")
+#    add_definitions(-DENABLE_PLAYERBOTS)
+#else()
+#    message(STATUS "Enable Player Bots    : No")
+#endif()
+
 if(BUILD_MANGOSD)
     message(STATUS "Build main server     : Yes (default)")
 else()

src/CMakeLists.txt

@@ -60,4 +60,4 @@ if(WIN32)
   install(FILES ${MYSQL_LIB_DIR}/${MYSQL_LIB_DLL} DESTINATION ${BIN_DIR})
   install(FILES ${OPENSSL_ROOT_DIR}/libeay32.dll DESTINATION ${BIN_DIR})
 endif()
-endif()
+endif()