Skip to content

Commit eb8e64b

Browse files
committed
add argon support
1 parent 341414f commit eb8e64b

8 files changed

Lines changed: 3572 additions & 323 deletions

File tree

CMakeLists.txt

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,17 @@
11
cmake_minimum_required(VERSION 3.21)
22
set(CMAKE_CXX_STANDARD 20)
33
set(CMAKE_CXX_STANDARD_REQUIRED ON)
4-
set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
4+
if ("${CMAKE_SYSTEM_NAME}" STREQUAL "iOS" OR IOS)
5+
set(CMAKE_OSX_ARCHITECTURES "arm64")
6+
else()
7+
if (DEFINED ENV{"GITHUB_ACTIONS"})
8+
set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
9+
elseif (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "arm64")
10+
set(CMAKE_OSX_ARCHITECTURES "arm64")
11+
else()
12+
set(CMAKE_OSX_ARCHITECTURES "x86_64")
13+
endif()
14+
endif()
515
set(CMAKE_CXX_VISIBILITY_PRESET hidden)
616

717
project(CreationRotation VERSION 1.0.0)
@@ -55,6 +65,8 @@ set(MBEDCRYPTO_LIBRARY "mbedcrypto")
5565
CPMAddPackage("gh:machinezone/IXWebSocket#dc8807e")
5666
install(TARGETS mbedtls mbedx509 mbedcrypto EXPORT mbedtls-targets)
5767

68+
CPMAddPackage("gh:LimeGradient/argon#main")
69+
5870
if (WIN32)
5971
if (CR_DEBUG)
6072
target_compile_definitions(mbedtls PRIVATE _HAS_ITERATOR_DEBUGGING=0)
@@ -67,6 +79,6 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE CR_EXPORTING)
6779
target_include_directories(${PROJECT_NAME} PRIVATE ${ixwebsocket_SOURCE_DIR})
6880
target_include_directories(${PROJECT_NAME} PRIVATE "${CMAKE_SOURCE_DIR}/ext/cereal/include")
6981

70-
target_link_libraries(${PROJECT_NAME} ixwebsocket)
82+
target_link_libraries(${PROJECT_NAME} ixwebsocket argon)
7183

7284
setup_geode_mod(${PROJECT_NAME})

mod.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"geode": "4.1.2",
2+
"geode": "4.4.0",
33
"gd": {
44
"win": "2.2074",
55
"android": "2.2074",

0 commit comments

Comments
 (0)