From ebae4c26912306f68898ea8295318449b2f7f500 Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 30 Nov 2015 14:16:47 +0100 Subject: [PATCH 1/4] Fixed: Compilation under Linux --HG-- branch : develop --- code/ryzom/client/src/init.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/ryzom/client/src/init.cpp b/code/ryzom/client/src/init.cpp index fbf7e71dd..285382a4e 100644 --- a/code/ryzom/client/src/init.cpp +++ b/code/ryzom/client/src/init.cpp @@ -95,7 +95,13 @@ #include "browse_faq.h" +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif +#ifndef RYZOM_CLIENT_ICON +#define RYZOM_CLIENT_ICON "ryzom_client" +#endif // XMLLib #include From 7337ee4faafed5f6a2bbb7d629a852d99f427fdc Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 30 Nov 2015 14:18:04 +0100 Subject: [PATCH 2/4] Fixed: Warning filePath not being a const char* --HG-- branch : develop --- code/nel/tools/3d/mesh_export/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/nel/tools/3d/mesh_export/main.cpp b/code/nel/tools/3d/mesh_export/main.cpp index 1503a4b16..81b850a23 100644 --- a/code/nel/tools/3d/mesh_export/main.cpp +++ b/code/nel/tools/3d/mesh_export/main.cpp @@ -46,7 +46,7 @@ int main(int argc, char *argv[]) if (!NLMISC::CFile::fileExists(filePath)) { printHelp(args); - nlerror("File '%s' does not exist", filePath); + nlerror("File '%s' does not exist", filePath.c_str()); return EXIT_FAILURE; } From b4e1dcbc108173029281bff714d6afb5ca369baf Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 30 Nov 2015 14:19:05 +0100 Subject: [PATCH 3/4] Fixed: Link error under Debian Squeeze --HG-- branch : develop --- code/nel/src/georges/CMakeLists.txt | 2 +- code/nel/src/ligo/CMakeLists.txt | 2 +- code/nel/src/sound/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/nel/src/georges/CMakeLists.txt b/code/nel/src/georges/CMakeLists.txt index 1d56a31bf..6d4e14297 100644 --- a/code/nel/src/georges/CMakeLists.txt +++ b/code/nel/src/georges/CMakeLists.txt @@ -7,7 +7,7 @@ NL_TARGET_LIB(nelgeorges ${HEADERS} ${SRC}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) -TARGET_LINK_LIBRARIES(nelgeorges ${LIBXML2_LIBRARIES} nelmisc) +TARGET_LINK_LIBRARIES(nelgeorges nelmisc) SET_TARGET_PROPERTIES(nelgeorges PROPERTIES LINK_INTERFACE_LIBRARIES "") NL_DEFAULT_PROPS(nelgeorges "NeL, Library: NeL Georges") NL_ADD_RUNTIME_FLAGS(nelgeorges) diff --git a/code/nel/src/ligo/CMakeLists.txt b/code/nel/src/ligo/CMakeLists.txt index 4c1bfbc30..e541956fd 100644 --- a/code/nel/src/ligo/CMakeLists.txt +++ b/code/nel/src/ligo/CMakeLists.txt @@ -5,7 +5,7 @@ NL_TARGET_LIB(nelligo ${HEADERS} ${SRC}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) -TARGET_LINK_LIBRARIES(nelligo ${LIBXML2_LIBRARIES} nelmisc) +TARGET_LINK_LIBRARIES(nelligo nelmisc) SET_TARGET_PROPERTIES(nelligo PROPERTIES LINK_INTERFACE_LIBRARIES "") NL_DEFAULT_PROPS(nelligo "NeL, Library: NeL Ligo") NL_ADD_RUNTIME_FLAGS(nelligo) diff --git a/code/nel/src/sound/CMakeLists.txt b/code/nel/src/sound/CMakeLists.txt index 6b0dc285d..ec100dadf 100644 --- a/code/nel/src/sound/CMakeLists.txt +++ b/code/nel/src/sound/CMakeLists.txt @@ -98,7 +98,7 @@ ENDIF(WITH_STATIC) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) -TARGET_LINK_LIBRARIES(nelsound ${LIBXML2_LIBRARIES} nelmisc nelligo nelgeorges nel3d nelsnd_lowlevel) +TARGET_LINK_LIBRARIES(nelsound nelmisc nelligo nelgeorges nel3d nelsnd_lowlevel) SET_TARGET_PROPERTIES(nelsound PROPERTIES LINK_INTERFACE_LIBRARIES "") NL_DEFAULT_PROPS(nelsound "NeL, Library: NeL Sound") NL_ADD_RUNTIME_FLAGS(nelsound) From 68cbba44ce506a5c327133d3c45ae143aea5c073 Mon Sep 17 00:00:00 2001 From: kervala Date: Mon, 30 Nov 2015 14:19:38 +0100 Subject: [PATCH 4/4] Fixed: Assimp depends on ZLIB --HG-- branch : develop --- code/CMakeModules/Findassimp.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/CMakeModules/Findassimp.cmake b/code/CMakeModules/Findassimp.cmake index 6748cd221..41e53cf94 100644 --- a/code/CMakeModules/Findassimp.cmake +++ b/code/CMakeModules/Findassimp.cmake @@ -12,6 +12,10 @@ FIND_LIBRARY( IF (assimp_INCLUDE_DIRS AND assimp_LIBRARIES) SET(assimp_FOUND TRUE) + FIND_PACKAGE(ZLIB) + IF(ZLIB_FOUND) + SET(assimp_LIBRARIES ${assimp_LIBRARIES} ${ZLIB_LIBRARIES}) + ENDIF() ENDIF (assimp_INCLUDE_DIRS AND assimp_LIBRARIES) IF (assimp_FOUND)