From 2cb01a7c65c30553f2f919935a26ad78dc027729 Mon Sep 17 00:00:00 2001 From: Karutoh Date: Fri, 9 May 2025 19:43:05 -0700 Subject: [PATCH] Fixed Windows CI/CD and fixed AVX on AARCH64 again. --- .gitea/workflows/BuildRelease.yaml | 2 ++ CMakeLists.txt | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/BuildRelease.yaml b/.gitea/workflows/BuildRelease.yaml index 6062a6d..b732df4 100644 --- a/.gitea/workflows/BuildRelease.yaml +++ b/.gitea/workflows/BuildRelease.yaml @@ -35,6 +35,8 @@ jobs: mv build/Release/EHS_Dyn.dll bin mv build/Release/StrToHash.exe bin mv build/Release/zlib1.dll bin + mv build/Release/libcrypto-3-x64.dll bin + mv build/Release/libssl-3-x64.dll bin mkdir lib mv build/Release/EHS_Stc.lib lib mv build/Release/EHS_Dyn.lib lib diff --git a/CMakeLists.txt b/CMakeLists.txt index cd92063..9b607b6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -237,7 +237,6 @@ elseif (IS_OS_LINUX) src/io/Directory_LNX.cpp include/ehs/io/Directory_LNX.h src/io/Usb_LNX.cpp include/ehs/io/Usb_LNX.h include/ehs/io/socket/ICMP_LNX.h src/io/socket/ICMP_LNX.cpp - src/system/AVX2_GCC_AMD64.asm src/system/AVX512_GCC_AMD64.asm ) #set(LINUX_WINDOW_SYSTEM "Wayland" CACHE STRING "Linux Window System") @@ -256,7 +255,7 @@ elseif (IS_OS_LINUX) endif () if (IS_ARCH_AMD64) - list(APPEND EHS_SOURCES src/system/CPU_GCC_AMD64.asm src/HRNG_GCC.asm src/Math_GCC_AMD64.asm) + list(APPEND EHS_SOURCES src/system/CPU_GCC_AMD64.asm src/HRNG_GCC.asm src/Math_GCC_AMD64.asm src/system/AVX2_GCC_AMD64.asm src/system/AVX512_GCC_AMD64.asm) elseif (IS_ARCH_ARM64) list(APPEND EHS_SOURCES src/system/CPU_ARM64.cpp src/HRNG_ARM64.cpp src/Math_GCC_ARM64.s src/system/AVX2_AARCH64.cpp src/system/AVX512_AARCH64.cpp) endif ()