From 0985762b631eca4ad6c395b6128dc467713e4f6c Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 5 Sep 2010 11:29:34 +0200 Subject: [PATCH] Fixed: Compilation under Linux --- code/CMakeModules/nel.cmake | 2 +- code/ryzom/client/src/CMakeLists.txt | 1 + .../server/src/admin_modules/CMakeLists.txt | 2 +- code/ryzom/server/src/ai_share/CMakeLists.txt | 2 +- .../server/src/mirror_service/data_set_ms.h | 2 +- .../server/src/mirror_service/mirror_service.h | 4 ++-- .../server/src/server_share/CMakeLists.txt | 2 +- .../tools/client/client_patcher/CMakeLists.txt | 3 ++- .../leveldesign/csv_transform/CMakeLists.txt | 18 ++++++++++-------- 9 files changed, 20 insertions(+), 16 deletions(-) diff --git a/code/CMakeModules/nel.cmake b/code/CMakeModules/nel.cmake index eab856e20..f01e91ca6 100644 --- a/code/CMakeModules/nel.cmake +++ b/code/CMakeModules/nel.cmake @@ -270,7 +270,7 @@ MACRO(NL_SETUP_BUILD) SET(NL_DEBUG_LINK_FLAGS "/NODEFAULTLIB:msvcrt") SET(NL_RELEASE_LINK_FLAGS "/OPT:REF /OPT:ICF") ELSE(WIN32) - SET(PLATFORM_CFLAGS "-ftemplate-depth-24 -D_REENTRANT -Wall -ansi -W -Wpointer-arith -Wsign-compare -Wno-deprecated-declarations -Wno-multichar -Wno-long-long -Wno-unused") + SET(PLATFORM_CFLAGS "-ftemplate-depth-48 -D_REENTRANT -Wall -ansi -W -Wpointer-arith -Wsign-compare -Wno-deprecated-declarations -Wno-multichar -Wno-long-long -Wno-unused -fno-strict-aliasing") IF(WITH_COVERAGE) SET(PLATFORM_CFLAGS "-fprofile-arcs -ftest-coverage ${PLATFORM_CFLAGS}") ENDIF(WITH_COVERAGE) diff --git a/code/ryzom/client/src/CMakeLists.txt b/code/ryzom/client/src/CMakeLists.txt index 7d4055570..9ac9df373 100644 --- a/code/ryzom/client/src/CMakeLists.txt +++ b/code/ryzom/client/src/CMakeLists.txt @@ -60,6 +60,7 @@ ENDIF(APPLE) ADD_EXECUTABLE(ryzom_client WIN32 MACOSX_BUNDLE ${SRC}) INCLUDE_DIRECTORIES( + ${CMAKE_CURRENT_SOURCE_DIR} ${LIBXML2_INCLUDE_DIR} ${LUA_INCLUDE_DIR} ${LUABIND_INCLUDE_DIR} diff --git a/code/ryzom/server/src/admin_modules/CMakeLists.txt b/code/ryzom/server/src/admin_modules/CMakeLists.txt index 25ee5ede3..2ec32a298 100644 --- a/code/ryzom/server/src/admin_modules/CMakeLists.txt +++ b/code/ryzom/server/src/admin_modules/CMakeLists.txt @@ -1,6 +1,6 @@ FILE(GLOB SRC *.cpp *.h) -ADD_LIBRARY(admin_modules STATIC ${SRC}) +NL_TARGET_LIB(admin_modules ${SRC}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) TARGET_LINK_LIBRARIES(admin_modules nelmisc) diff --git a/code/ryzom/server/src/ai_share/CMakeLists.txt b/code/ryzom/server/src/ai_share/CMakeLists.txt index 28c8eba95..b669bfc45 100644 --- a/code/ryzom/server/src/ai_share/CMakeLists.txt +++ b/code/ryzom/server/src/ai_share/CMakeLists.txt @@ -1,6 +1,6 @@ FILE(GLOB SRC *.cpp *.h) -ADD_LIBRARY(ai_share STATIC ${SRC}) +NL_TARGET_LIB(ai_share ${SRC}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(ai_share ryzom_gameshare server_share nelmisc nelnet nelgeorges nelpacs) diff --git a/code/ryzom/server/src/mirror_service/data_set_ms.h b/code/ryzom/server/src/mirror_service/data_set_ms.h index f1ad6b369..47f1a2a37 100644 --- a/code/ryzom/server/src/mirror_service/data_set_ms.h +++ b/code/ryzom/server/src/mirror_service/data_set_ms.h @@ -27,7 +27,7 @@ #include //#include -#define slist list +#define slist std::list #undef DISPLAY_DELTAS diff --git a/code/ryzom/server/src/mirror_service/mirror_service.h b/code/ryzom/server/src/mirror_service/mirror_service.h index 9d6b5956b..7eea96a40 100644 --- a/code/ryzom/server/src/mirror_service/mirror_service.h +++ b/code/ryzom/server/src/mirror_service/mirror_service.h @@ -375,7 +375,7 @@ public: } ++_NbChangesPushed; } - catch ( EReallocationFailed& ) + catch ( NLMISC::EReallocationFailed& ) { nlwarning( "ERROR: Can't reallocate DeltaBuffer (E%u propIndex %hd %s NbChangesPushed %d oldpos %d bufpos %d bufsize %u StoredNbChangesPushedProps %d NbChangesPushedInTickProps %d StoredNbChangesPushedRowMgt %d NbChangesPushedInTickRowMgt %d)", datasetrow.getIndex(), propIndex, _DataSet->propIsList(propIndex) ? "list" : "normal", @@ -948,7 +948,7 @@ protected: while ( datasetRow.isValid() ) { // Read timestamp - TGameCycle timestamp; + NLMISC::TGameCycle timestamp; msgin.fastRead( timestamp ); // Check remCounter diff --git a/code/ryzom/server/src/server_share/CMakeLists.txt b/code/ryzom/server/src/server_share/CMakeLists.txt index 574e2ae91..6779f327a 100644 --- a/code/ryzom/server/src/server_share/CMakeLists.txt +++ b/code/ryzom/server/src/server_share/CMakeLists.txt @@ -1,6 +1,6 @@ FILE(GLOB SRC *.cpp *.h) -ADD_LIBRARY(server_share STATIC ${SRC}) +NL_TARGET_LIB(server_share ${SRC}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}) TARGET_LINK_LIBRARIES(server_share nelmisc nelpacs ${NELPACS_LIBRARY} ${MYSQL_LIBRARIES} ${ZLIB_LIBRARIES}) diff --git a/code/ryzom/tools/client/client_patcher/CMakeLists.txt b/code/ryzom/tools/client/client_patcher/CMakeLists.txt index 2c6f05a54..c1810ee5f 100644 --- a/code/ryzom/tools/client/client_patcher/CMakeLists.txt +++ b/code/ryzom/tools/client/client_patcher/CMakeLists.txt @@ -9,6 +9,7 @@ FILE(GLOB SRC main.cpp ADD_EXECUTABLE(ryzom_client_patcher ${SRC}) INCLUDE_DIRECTORIES( + ${LIBXML2_INCLUDE_DIR} ${CURL_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/ryzom/client/src ) @@ -20,7 +21,7 @@ TARGET_LINK_LIBRARIES(ryzom_client_patcher ${PLATFORM_LINKFLAGS} ryzom_sevenzip ${CURL_LIBRARIES}) -ADD_DEFINITIONS(${CURL_DEFINITIONS} -DRZ_NO_CLIENT -DNL_USE_SEVENZIP) +ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} ${CURL_DEFINITIONS} -DRZ_NO_CLIENT -DNL_USE_SEVENZIP) NL_DEFAULT_PROPS(ryzom_client_patcher "Ryzom, Tools: Ryzom Client Patcher") NL_ADD_RUNTIME_FLAGS(ryzom_client_patcher) diff --git a/code/ryzom/tools/leveldesign/csv_transform/CMakeLists.txt b/code/ryzom/tools/leveldesign/csv_transform/CMakeLists.txt index 099018105..107ee036b 100644 --- a/code/ryzom/tools/leveldesign/csv_transform/CMakeLists.txt +++ b/code/ryzom/tools/leveldesign/csv_transform/CMakeLists.txt @@ -1,9 +1,11 @@ -FILE(GLOB SRC *.cpp *.h) - -ADD_EXECUTABLE(csv_transform ${SRC}) - -TARGET_LINK_LIBRARIES(csv_transform ${PLATFORM_LINKFLAGS} nelmisc) +FILE(GLOB SRC *.cpp *.h) + +ADD_EXECUTABLE(csv_transform ${SRC}) + +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) + +TARGET_LINK_LIBRARIES(csv_transform ${PLATFORM_LINKFLAGS} nelmisc) NL_DEFAULT_PROPS(csv_transform "Ryzom, Tools, Misc: CSV Transform") -NL_ADD_RUNTIME_FLAGS(csv_transform) - -INSTALL(TARGETS csv_transform RUNTIME DESTINATION bin COMPONENT tools) +NL_ADD_RUNTIME_FLAGS(csv_transform) + +INSTALL(TARGETS csv_transform RUNTIME DESTINATION bin COMPONENT tools)