aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-26 17:16:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed: Compilation under Linux

Browse source
This commit is contained in:
kervala 2010-09-05 11:29:34 +02:00
parent 45e3a5bff6
commit 0985762b63
9 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/CMakeModules/nel.cmake
View file

@ -270,7 +270,7 @@ MACRO(NL_SETUP_BUILD)
SET(NL_DEBUG_LINK_FLAGS "/NODEFAULTLIB:msvcrt") SET(NL_DEBUG_LINK_FLAGS "/NODEFAULTLIB:msvcrt")
SET(NL_RELEASE_LINK_FLAGS "/OPT:REF /OPT:ICF") SET(NL_RELEASE_LINK_FLAGS "/OPT:REF /OPT:ICF")
ELSE(WIN32) 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) IF(WITH_COVERAGE)
SET(PLATFORM_CFLAGS "-fprofile-arcs -ftest-coverage ${PLATFORM_CFLAGS}") SET(PLATFORM_CFLAGS "-fprofile-arcs -ftest-coverage ${PLATFORM_CFLAGS}")
ENDIF(WITH_COVERAGE) ENDIF(WITH_COVERAGE)

1
code/ryzom/client/src/CMakeLists.txt
View file

@ -60,6 +60,7 @@ ENDIF(APPLE)
ADD_EXECUTABLE(ryzom_client WIN32 MACOSX_BUNDLE ${SRC}) ADD_EXECUTABLE(ryzom_client WIN32 MACOSX_BUNDLE ${SRC})
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${LIBXML2_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR}
${LUA_INCLUDE_DIR} ${LUA_INCLUDE_DIR}
${LUABIND_INCLUDE_DIR} ${LUABIND_INCLUDE_DIR}

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

@ -1,6 +1,6 @@
FILE(GLOB SRC *.cpp *.h) 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}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
TARGET_LINK_LIBRARIES(admin_modules nelmisc) TARGET_LINK_LIBRARIES(admin_modules nelmisc)

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

@ -1,6 +1,6 @@
FILE(GLOB SRC *.cpp *.h) FILE(GLOB SRC *.cpp *.h)
ADD_LIBRARY(ai_share STATIC ${SRC}) NL_TARGET_LIB(ai_share ${SRC})
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(ai_share ryzom_gameshare server_share nelmisc nelnet nelgeorges nelpacs) TARGET_LINK_LIBRARIES(ai_share ryzom_gameshare server_share nelmisc nelnet nelgeorges nelpacs)

2
code/ryzom/server/src/mirror_service/data_set_ms.h
View file

@ -27,7 +27,7 @@
#include <nel/net/service.h> #include <nel/net/service.h>
//#include <slist> //#include <slist>
#define slist list #define slist std::list
#undef DISPLAY_DELTAS #undef DISPLAY_DELTAS

4
code/ryzom/server/src/mirror_service/mirror_service.h
View file

@ -375,7 +375,7 @@ public:
} }
++_NbChangesPushed; ++_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)", 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", datasetrow.getIndex(), propIndex, _DataSet->propIsList(propIndex) ? "list" : "normal",
@ -948,7 +948,7 @@ protected:
while ( datasetRow.isValid() ) while ( datasetRow.isValid() )
{ {
// Read timestamp // Read timestamp
TGameCycle timestamp; NLMISC::TGameCycle timestamp;
msgin.fastRead( timestamp ); msgin.fastRead( timestamp );
// Check remCounter // Check remCounter

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

@ -1,6 +1,6 @@
FILE(GLOB SRC *.cpp *.h) 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}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(server_share nelmisc nelpacs ${NELPACS_LIBRARY} ${MYSQL_LIBRARIES} ${ZLIB_LIBRARIES}) TARGET_LINK_LIBRARIES(server_share nelmisc nelpacs ${NELPACS_LIBRARY} ${MYSQL_LIBRARIES} ${ZLIB_LIBRARIES})

3
code/ryzom/tools/client/client_patcher/CMakeLists.txt
View file

@ -9,6 +9,7 @@ FILE(GLOB SRC main.cpp
ADD_EXECUTABLE(ryzom_client_patcher ${SRC}) ADD_EXECUTABLE(ryzom_client_patcher ${SRC})
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${LIBXML2_INCLUDE_DIR}
${CURL_INCLUDE_DIRS} ${CURL_INCLUDE_DIRS}
${CMAKE_SOURCE_DIR}/ryzom/client/src ${CMAKE_SOURCE_DIR}/ryzom/client/src
) )
@ -20,7 +21,7 @@ TARGET_LINK_LIBRARIES(ryzom_client_patcher ${PLATFORM_LINKFLAGS}
ryzom_sevenzip ryzom_sevenzip
${CURL_LIBRARIES}) ${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_DEFAULT_PROPS(ryzom_client_patcher "Ryzom, Tools: Ryzom Client Patcher")
NL_ADD_RUNTIME_FLAGS(ryzom_client_patcher) NL_ADD_RUNTIME_FLAGS(ryzom_client_patcher)

18
code/ryzom/tools/leveldesign/csv_transform/CMakeLists.txt
View file

@ -1,9 +1,11 @@
FILE(GLOB SRC *.cpp *.h) FILE(GLOB SRC *.cpp *.h)
ADD_EXECUTABLE(csv_transform ${SRC}) ADD_EXECUTABLE(csv_transform ${SRC})
TARGET_LINK_LIBRARIES(csv_transform ${PLATFORM_LINKFLAGS} nelmisc) 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_DEFAULT_PROPS(csv_transform "Ryzom, Tools, Misc: CSV Transform")
NL_ADD_RUNTIME_FLAGS(csv_transform) NL_ADD_RUNTIME_FLAGS(csv_transform)
INSTALL(TARGETS csv_transform RUNTIME DESTINATION bin COMPONENT tools) INSTALL(TARGETS csv_transform RUNTIME DESTINATION bin COMPONENT tools)