Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

merge

Browse source
This commit is contained in:
Matt Raykowski 2010-05-20 15:40:47 -05:00
commit 944a2bd4e6
9 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/ryzom/CMakeLists.txt
View file

@ -106,6 +106,10 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/common )
NL_SETUP_BUILD_FLAGS()
IF(FINAL_VERSION)
ADD_DEFINITIONS(-DFINAL_VERSION=1)
ENDIF(FINAL_VERSION)
ADD_SUBDIRECTORY(common)
IF(WITH_CLIENT)

2
code/ryzom/CMakeModules/FindMySQL.cmake
View file

@ -18,6 +18,7 @@ ELSE(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES)
FIND_PATH(MYSQL_INCLUDE_DIR mysql.h
/usr/include/mysql
/usr/local/include/mysql
/opt/local/include/mysql5/mysql
$ENV{ProgramFiles}/MySQL/*/include
$ENV{SystemDrive}/MySQL/*/include)
@ -33,6 +34,7 @@ ELSE(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES)
/usr/local/lib
/usr/lib/mysql
/usr/local/lib/mysql
/opt/local/lib/mysql5/mysql
)
ENDIF(WIN32 AND MSVC)

3
code/ryzom/CMakeModules/nel.cmake
View file

@ -25,7 +25,8 @@ MACRO(NL_SETUP_DEFAULT_OPTIONS)
OPTION(WITH_CLIENT "Build Ryzom Core Client" ON )
OPTION(WITH_TOOLS "Build Ryzom Core Tools" ON )
OPTION(WITH_SERVER "Build Ryzom Core Services" ON )
OPTION(WITH_LUA51 "Build Ryzom Core using Lua51" OFF)
OPTION(WITH_LUA51 "Build Ryzom Core using Lua51" ON )
OPTION(FINAL_VERSION "Build in Final Version mode" ON )
###
# Features

5
code/ryzom/server/src/admin_modules/CMakeLists.txt
View file

@ -3,11 +3,8 @@ FILE(GLOB SRC *.cpp *.h)
# Filter out the source files not actually compiled.
LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/Backup\ 1\ of\ admin_modules.cpp)
IF(WIN32)
ADD_LIBRARY(admin_modules STATIC ${SRC})
ELSE(WIN32)
ADD_LIBRARY(admin_modules SHARED ${SRC})
ENDIF(WIN32)
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
TARGET_LINK_LIBRARIES(admin_modules ${NELMISC_LIBRARY})

6
code/ryzom/server/src/admin_modules/aes_client_module.cpp
View file

@ -117,9 +117,9 @@ namespace ADMIN
CAdminExecutorServiceClient()
: _DontUseShardOrders(false),
_ProcessUsedMemory(0),
_LastStateReport(0),
_LastStatusStringReport(0)
_LastStatusStringReport(0),
_ProcessUsedMemory(0)
{
CAdminExecutorServiceClientSkel::init(this);
@ -186,7 +186,7 @@ namespace ADMIN
// loop for an optionnal 'dontUseShardOrders' flag in init params
const TParsedCommandLine *duso = pcl.getParam("dontUseShardOrders");
if (duso != NULL)
_DontUseShardOrders = (duso->ParamValue == "true" | duso->ParamName == "1");
_DontUseShardOrders = (duso->ParamValue == "true" || duso->ParamName == "1");
return true;
}

1
code/ryzom/server/src/ai_service/CMakeLists.txt
View file

@ -23,6 +23,7 @@ ADD_EXECUTABLE(ai_service ${SRC})
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(ai_service admin_modules
game_share
server_share
ai_share
${PLATFORM_LINKFLAGS}
${LIBXML2_LIBRARIES}

3
code/ryzom/server/src/ai_share/CMakeLists.txt
View file

@ -1,7 +1,8 @@
FILE(GLOB SRC *.cpp *.h)
# Filter out the source files not actually compiled.
#LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/Backup\ 1\ of\ admin_modules.cpp)
LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/world_map.cpp
${CMAKE_CURRENT_SOURCE_DIR}/world_map.h)
ADD_LIBRARY(ai_share STATIC ${SRC})

2
code/ryzom/server/src/ai_share/primitive_parser.cpp
View file

@ -3232,6 +3232,8 @@ static void parsePrimSquadTemplate(const IPrimitive *prim, const std::string &ma
case AITypeSquadTemplateVariant:
parsePrimSquadTemplateVariant(nextTreeNode(aliasNode,child), child, name);
break;
default:
break;
}
}
}

9
code/ryzom/server/src/server_share/CMakeLists.txt
View file

@ -3,14 +3,13 @@ FILE(GLOB SRC *.cpp *.h)
# Filter out the source files not actually compiled.
#LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/Backup\ 1\ of\ admin_modules.cpp)
IF(WIN32)
ADD_LIBRARY(server_share STATIC ${SRC})
ELSE(WIN32)
ADD_LIBRARY(server_share SHARED ${SRC})
ENDIF(WIN32)
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(server_share ${NELMISC_LIBRARY} ${NELPACS_LIBRARY} ${MYSQL_LIBRARIES} ${ZLIB_LIBRARIES})
TARGET_LINK_LIBRARIES(server_share ${NELMISC_LIBRARY}
${NELPACS_LIBRARY}
${MYSQL_LIBRARIES}
${ZLIB_LIBRARIES})
SET_TARGET_PROPERTIES(server_share PROPERTIES VERSION ${NL_VERSION})
IF(WIN32)