Merge with develop

--HG--
branch : compatibility-develop
This commit is contained in:
Nimetu 2017-10-02 15:54:16 +03:00
commit 201fc3eb12

View file

@ -177,6 +177,7 @@ IF(WITH_RYZOM_CLIENT)
${LUA_LIBRARIES} ${LUA_LIBRARIES}
${LUABIND_LIBRARIES} ${LUABIND_LIBRARIES}
${CURL_LIBRARIES} ${CURL_LIBRARIES}
${OPENSSL_LIBRARIES}
) )
IF(NOT APPLE AND NOT WIN32) IF(NOT APPLE AND NOT WIN32)