Merge with develop

--HG--
branch : compatibility-develop
hg/compatibility-develop
kervala 6 years ago
commit 6311240b6c

@ -1,7 +1,4 @@
# only compile game_share for Ryzom client, server and tools ADD_SUBDIRECTORY(src)
IF(WITH_RYZOM_CLIENT OR WITH_RYZOM_SERVER OR WITH_RYZOM_TOOLS)
ADD_SUBDIRECTORY(src)
ENDIF()
#ADD_CUSTOM_COMMAND(OUTPUT "${CMAKE_BINARY_DIR}/share/data_common.bnp" #ADD_CUSTOM_COMMAND(OUTPUT "${CMAKE_BINARY_DIR}/share/data_common.bnp"
# COMMAND bnp_make -p ${CMAKE_CURRENT_SOURCE_DIR}/data_common ${CMAKE_BINARY_DIR}/share > /dev/null) # COMMAND bnp_make -p ${CMAKE_CURRENT_SOURCE_DIR}/data_common ${CMAKE_BINARY_DIR}/share > /dev/null)

Loading…
Cancel
Save