diff --git a/CMakeLists.txt b/CMakeLists.txt index 531ffa95..2b2dd0aa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -112,6 +112,7 @@ if(DEFINED ENV{LUA_COMPAT53_DIR}) set(LUA_COMPAT53_DIR $ENV{LUA_COMPAT53_DIR}) endif() include_directories(${LUA_COMPAT53_DIR}) +include_directories(${LUA_COMPAT53_DIR}/c-api) if (WithOpenSSL) include(deps/openssl.cmake) diff --git a/deps/lua-openssl b/deps/lua-openssl index a6b7c535..dcf4c834 160000 --- a/deps/lua-openssl +++ b/deps/lua-openssl @@ -1 +1 @@ -Subproject commit a6b7c53500155b8d45ccbc813e36a8bed93fc73b +Subproject commit dcf4c8340e4e44d3e3c3e404ddec87a42c61ce71 diff --git a/deps/openssl.cmake b/deps/openssl.cmake index c137d0f4..ad2e5e6f 100644 --- a/deps/openssl.cmake +++ b/deps/openssl.cmake @@ -27,11 +27,11 @@ else (WithSharedOpenSSL) set(OPENSSL_CONFIGURE_COMMAND ./config ${OPENSSL_CONFIG_OPTIONS}) set(OPENSSL_BUILD_COMMAND make) endif() - + ExternalProject_Add(openssl PREFIX openssl - URL https://www.openssl.org/source/openssl-1.1.1b.tar.gz - URL_HASH SHA256=5c557b023230413dfb0756f3137a13e6d726838ccd1430888ad15bfb2b43ea4b + URL https://www.openssl.org/source/openssl-1.1.1d.tar.gz + URL_HASH SHA256=1e3a91bc1f9dfce01af26026f856e064eab4c8ee0a8f457b5ae30b40b8b711f2 LOG_BUILD ON BUILD_IN_SOURCE YES BUILD_COMMAND ${OPENSSL_BUILD_COMMAND} @@ -39,10 +39,10 @@ else (WithSharedOpenSSL) INSTALL_COMMAND "" TEST_COMMAND "" ) - + set(OPENSSL_DIR ${CMAKE_BINARY_DIR}/openssl/src/openssl) set(OPENSSL_INCLUDE ${OPENSSL_DIR}/include) - + if(WIN32) set(OPENSSL_LIB_CRYPTO ${OPENSSL_DIR}/libcrypto.lib) set(OPENSSL_LIB_SSL ${OPENSSL_DIR}/libssl.lib) @@ -50,12 +50,12 @@ else (WithSharedOpenSSL) set(OPENSSL_LIB_CRYPTO ${OPENSSL_DIR}/libcrypto.a) set(OPENSSL_LIB_SSL ${OPENSSL_DIR}/libssl.a) endif() - + add_library(openssl_ssl STATIC IMPORTED) set_target_properties(openssl_ssl PROPERTIES IMPORTED_LOCATION ${OPENSSL_LIB_SSL}) add_library(openssl_crypto STATIC IMPORTED) set_target_properties(openssl_crypto PROPERTIES IMPORTED_LOCATION ${OPENSSL_LIB_CRYPTO}) - + include_directories(${OPENSSL_INCLUDE}) list(APPEND LIB_LIST openssl_ssl openssl_crypto) endif (WithSharedOpenSSL) diff --git a/src/luvi.h b/src/luvi.h index 03dc324f..6f500d1a 100644 --- a/src/luvi.h +++ b/src/luvi.h @@ -34,7 +34,7 @@ #endif #if (LUA_VERSION_NUM!=503) -#include "c-api/compat-5.3.h" +#include "compat-5.3.h" #endif #ifdef WITH_OPENSSL diff --git a/src/luvi_compat.c b/src/luvi_compat.c index 98b6fd6b..b8131a0b 100644 --- a/src/luvi_compat.c +++ b/src/luvi_compat.c @@ -3,8 +3,8 @@ #define lutf8lib_c #include "luvi.h" -#include "c-api/compat-5.3.h" -#include "c-api/compat-5.3.c" +#include "compat-5.3.h" +#include "compat-5.3.c" #include "lprefix.h" #include "lstrlib.c"