Merge branch 'master' into Playerbot

2023-07-30 14:37:00 +08:00
parent 78e21a0539 c590b6ce81
commit 058526b612
43 changed files with 831 additions and 648 deletions
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash

-export OPENSSL_ROOT_DIR=$(brew --prefix openssl@1.1)
+export OPENSSL_ROOT_DIR=$(brew --prefix openssl@3)

 export CCACHE_CPP2=true
 export CCACHE_MAXSIZE='500M'
@@ -26,4 +26,4 @@ if ! command -v cmake &>/dev/null ; then
 fi
 ##########################################

-brew install openssl@1.1 readline boost bash-completion curl unzip mysql ccache
+brew install openssl@3 readline boost bash-completion curl unzip mysql ccache