Browse Source

huh

Signed-off-by: crueter <crueter@eden-emu.dev>
update-cpmutil
crueter 1 day ago
parent
commit
004d908c2b
No known key found for this signature in database GPG Key ID: 425ACD2D4830EBC6
  1. 1
      CMakeLists.txt
  2. 2
      CMakeModules/CPMUtil.cmake
  3. 4
      cpmfile.json

1
CMakeLists.txt

@ -63,6 +63,7 @@ if (YUZU_STATIC_ROOM)
set(Boost_USE_STATIC_LIBS ON) set(Boost_USE_STATIC_LIBS ON)
set(CMAKE_FIND_LIBRARY_SUFFIXES ".a") set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
set(OPENSSL_USE_STATIC_LIBS ON) set(OPENSSL_USE_STATIC_LIBS ON)
set(OpenSSL_FORCE_SYSTEM ON)
set(zstd_FORCE_BUNDLED ON) set(zstd_FORCE_BUNDLED ON)
set(fmt_FORCE_BUNDLED ON) set(fmt_FORCE_BUNDLED ON)

2
CMakeModules/CPMUtil.cmake

@ -667,7 +667,7 @@ function(AddCIPackage)
set(archname universal) set(archname universal)
elseif((WIN32 OR LINUX) AND CPMUTIL_AMD64) elseif((WIN32 OR LINUX) AND CPMUTIL_AMD64)
set(archname amd64) set(archname amd64)
elseif(WIN32 and CPMUTIL_ARM64)
elseif(WIN32 AND CPMUTIL_ARM64)
set(archname arm64) set(archname arm64)
elseif((IOS OR LINUX OR ANDROID) AND CPMUTIL_ARM64) elseif((IOS OR LINUX OR ANDROID) AND CPMUTIL_ARM64)
set(archname aarch64) set(archname aarch64)

4
cpmfile.json

@ -204,7 +204,7 @@
}, },
"openssl": { "openssl": {
"hash": "29002ce50cb95a4f4f1d0e9d3f684401fbd4eac34203dc2eef3b6334af5d44aa46bf788b63a6f5c139c383eafb7269ae87a58a9a3ad5912903b9773e545ccc0a", "hash": "29002ce50cb95a4f4f1d0e9d3f684401fbd4eac34203dc2eef3b6334af5d44aa46bf788b63a6f5c139c383eafb7269ae87a58a9a3ad5912903b9773e545ccc0a",
"min_version": "3",
"min_version": "3.0.0",
"package": "OpenSSL", "package": "OpenSSL",
"patches": [ "patches": [
"0001-add-bundled-cert.patch" "0001-add-bundled-cert.patch"
@ -215,7 +215,7 @@
}, },
"openssl-ci": { "openssl-ci": {
"ci": true, "ci": true,
"min_version": "3",
"min_version": "3.0.0",
"name": "openssl", "name": "openssl",
"package": "OpenSSL", "package": "OpenSSL",
"repo": "crueter-ci/OpenSSL", "repo": "crueter-ci/OpenSSL",

Loading…
Cancel
Save