aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-12-24 01:38:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge with develop

Browse source
This commit is contained in:
kervala 2015-11-30 14:20:16 +01:00
parent b19701dd78
commit 1a7293c697
6 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/CMakeModules/Findassimp.cmake
View file

@ -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)

2
code/nel/src/georges/CMakeLists.txt
View file

@ -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)

2
code/nel/src/ligo/CMakeLists.txt
View file

@ -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)

2
code/nel/src/sound/CMakeLists.txt
View file

@ -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)

2
code/nel/tools/3d/mesh_export/main.cpp
View file

@ -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;
}

6
code/ryzom/client/src/init.cpp
View file

@ -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 <libxml/xmlmemory.h>