Browse Source
[externals] OpenSSL -> v3.6.0-e3608d80df
macos-universal, mingw w/proper linking
Signed-off-by: crueter <crueter@eden-emu.dev>
pull/3003/head
crueter
3 months ago
No known key found for this signature in database
GPG Key ID: 425ACD2D4830EBC6
3 changed files with
11 additions and
10 deletions
-
CMakeLists.txt
-
cpmfile.json
-
tools/cpm/check-updates.sh
|
|
|
@ -155,17 +155,19 @@ if (YUZU_STATIC_BUILD) |
|
|
|
|
|
|
|
set(YUZU_USE_BUNDLED_FFMPEG ON) |
|
|
|
set(YUZU_USE_BUNDLED_SDL2 ON) |
|
|
|
set(YUZU_USE_BUNDLED_OPENSSL ON) |
|
|
|
|
|
|
|
set(HTTPLIB_USE_BROTLI_IF_AVAILABLE OFF) |
|
|
|
elseif(APPLE) |
|
|
|
# these libs do not properly provide static libs/let you do it with cmake |
|
|
|
set(YUZU_USE_CPM ON) |
|
|
|
|
|
|
|
# IMPORTED_IMPLIB not set for imported target |
|
|
|
# TODO(crueter): wtf |
|
|
|
set(YUZU_USE_BUNDLED_FFMPEG ON) |
|
|
|
set(YUZU_USE_EXTERNAL_SDL2 ON) |
|
|
|
set(YUZU_USE_BUNDLED_OPENSSL ON) |
|
|
|
|
|
|
|
# IMPORTED_IMPLIB not set for imported target |
|
|
|
# TODO(crueter): wtf |
|
|
|
set(fmt_FORCE_BUNDLED ON) |
|
|
|
set(SPIRV-Tools_FORCE_BUNDLED ON) |
|
|
|
set(SPIRV-Headers_FORCE_BUNDLED ON) |
|
|
|
|
|
|
|
@ -4,13 +4,8 @@ |
|
|
|
"package": "OpenSSL", |
|
|
|
"name": "openssl", |
|
|
|
"repo": "crueter-ci/OpenSSL", |
|
|
|
"version": "3.6.0", |
|
|
|
"min_version": "1.1.1", |
|
|
|
"disabled_platforms": [ |
|
|
|
"macos-universal", |
|
|
|
"mingw-amd64", |
|
|
|
"mingw-arm64" |
|
|
|
] |
|
|
|
"version": "3.6.0-e3608d80df", |
|
|
|
"min_version": "1.1.1" |
|
|
|
}, |
|
|
|
"boost": { |
|
|
|
"package": "Boost", |
|
|
|
|
|
|
|
@ -67,7 +67,11 @@ while true; do |
|
|
|
|
|
|
|
[ "$REPO" = null ] && continue |
|
|
|
[ "$GIT_HOST" != "github.com" ] && continue # TODO |
|
|
|
# shellcheck disable=SC2153 |
|
|
|
|
|
|
|
if [ "$CI" = "true" ]; then |
|
|
|
TAG="v$VERSION" |
|
|
|
fi |
|
|
|
|
|
|
|
[ "$TAG" = null ] && continue |
|
|
|
|
|
|
|
echo "-- Package $PACKAGE" |
|
|
|
|