Merge with develop

--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2016-02-02 20:49:21 +01:00
commit 87e628cba0

View file

@ -5,7 +5,7 @@ FILE(GLOB LIB_SRC *.cpp *.h)
LIST(REMOVE_ITEM LIB_SRC ${CMAKE_CURRENT_SOURCE_DIR}/7zMain.cpp) LIST(REMOVE_ITEM LIB_SRC ${CMAKE_CURRENT_SOURCE_DIR}/7zMain.cpp)
NL_TARGET_LIB(ryzom_sevenzip ${LIB_SRC}) NL_TARGET_LIB(ryzom_sevenzip ${LIB_SRC})
# TARGET_LINK_LIBRARIES(ryzom_sevenzip ${PLATFORM_LINKFLAGS}) TARGET_LINK_LIBRARIES(ryzom_sevenzip nelmisc)
NL_DEFAULT_PROPS(ryzom_sevenzip "Ryzom, Library: Seven Zip") NL_DEFAULT_PROPS(ryzom_sevenzip "Ryzom, Library: Seven Zip")
NL_ADD_RUNTIME_FLAGS(ryzom_sevenzip) NL_ADD_RUNTIME_FLAGS(ryzom_sevenzip)
NL_ADD_LIB_SUFFIX(ryzom_sevenzip) NL_ADD_LIB_SUFFIX(ryzom_sevenzip)