AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2025-07-06 07:44:57 +03:00
Code Releases Activity

gitlab-ci: enable ubuntu 12.04 builds

Browse Source
This commit is contained in:
Ilya Shipitsin
2018-10-12 01:03:12 +05:00
parent 0e22adc598
commit ec09309aa8
4 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Mayaqua/CMakeLists.txt
View File

@ -19,11 +19,24 @@ find_package(ZLIB REQUIRED)
# In some cases libiconv is not included in libc
find_library(LIB_ICONV iconv)
add_subdirectory(cpu_features)
if(HAVE_SYS_AUXV)
add_subdirectory(cpu_features)
endif()
target_include_directories(mayaqua PRIVATE cpu_features/include)
target_link_libraries(mayaqua cpu_features OpenSSL::SSL OpenSSL::Crypto Threads::Threads ZLIB::ZLIB)
target_link_libraries(mayaqua OpenSSL::SSL OpenSSL::Crypto Threads::Threads ZLIB::ZLIB)
if(HAVE_SYS_AUXV)
target_link_libraries(mayaqua cpu_features)
else()
add_definitions(-DSKIP_CPU_FEATURES)
endif()
find_library(LIB_RT rt)
if(LIB_RT)
target_link_libraries(mayaqua rt)
endif()
if(LIB_ICONV)
target_link_libraries(mayaqua ${LIB_ICONV})

4
src/Mayaqua/Encrypt.c
View File

@ -148,7 +148,11 @@
#ifdef _MSC_VER
#include <intrin.h> // For __cpuid()
#else // _MSC_VER
#ifndef SKIP_CPU_FEATURES
#include "cpu_features_macros.h"
#endif
#if defined(CPU_FEATURES_ARCH_X86)
#include "cpuinfo_x86.h"
#elif defined(CPU_FEATURES_ARCH_ARM)