mirror of
https://git.eden-emu.dev/eden-emu/eden.git
synced 2026-08-29 01:56:06 +00:00
properly build with new openssl cpm mechanism
This commit is contained in:
+3
-7
@@ -48,19 +48,15 @@ export EXTRA_CMAKE_FLAGS=("${EXTRA_CMAKE_FLAGS[@]}" $@)
|
|||||||
-DENABLE_LIBUSB=OFF \
|
-DENABLE_LIBUSB=OFF \
|
||||||
-DENABLE_UPDATE_CHECKER=OFF \
|
-DENABLE_UPDATE_CHECKER=OFF \
|
||||||
-DENABLE_QT=OFF \
|
-DENABLE_QT=OFF \
|
||||||
-DENABLE_OPENSSL=OFF \
|
-DENABLE_OPENGL=OFF \
|
||||||
-DENABLE_WEB_SERVICE=OFF \
|
-DENABLE_WEB_SERVICE=OFF \
|
||||||
-DUSE_DISCORD_PRESENCE=OFF \
|
-DUSE_DISCORD_PRESENCE=OFF \
|
||||||
-DCPMUTIL_FORCE_BUNDLED=ON \
|
-DCPMUTIL_FORCE_BUNDLED=ON \
|
||||||
-DOPENSSL_ROOT_DIR="$OO_PS4_TOOLCHAIN" \
|
|
||||||
-DOPENSSL_SSL_LIBRARY="$OO_PS4_TOOLCHAIN/lib/libssl.a" \
|
|
||||||
-DOPENSSL_CRYPTO_LIBRARY="$OO_PS4_TOOLCHAIN/lib/libcrypto.a" \
|
|
||||||
-DOPENSSL_INCLUDE_DIR="$OO_PS4_TOOLCHAIN/include/openssl" \
|
|
||||||
-DYUZU_USE_EXTERNAL_FFMPEG=ON \
|
-DYUZU_USE_EXTERNAL_FFMPEG=ON \
|
||||||
-DYUZU_USE_CPM=ON \
|
-DYUZU_USE_CPM=ON \
|
||||||
-DDYNARMIC_ENABLE_NO_EXECUTE_SUPPORT=OFF \
|
-DDYNARMIC_ENABLE_NO_EXECUTE_SUPPORT=OFF \
|
||||||
-DDYNARMIC_TESTS=OFF \
|
-DDYNARMIC_TESTS=ON \
|
||||||
-DYUZU_TESTS=OFF \
|
-DYUZU_TESTS=ON \
|
||||||
-DYUZU_USE_EXTERNAL_SDL2=ON \
|
-DYUZU_USE_EXTERNAL_SDL2=ON \
|
||||||
"${EXTRA_CMAKE_FLAGS[@]}" || exit
|
"${EXTRA_CMAKE_FLAGS[@]}" || exit
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
diff --git a/libavutil/cpu.c b/libavutil/cpu.c
|
||||||
|
index 03e2720..874258f 100644
|
||||||
|
--- a/libavutil/cpu.c
|
||||||
|
+++ b/libavutil/cpu.c
|
||||||
|
@@ -43,8 +43,10 @@
|
||||||
|
#include <sys/param.h>
|
||||||
|
#endif
|
||||||
|
#include <sys/types.h>
|
||||||
|
+#ifndef __OPENORBIS__
|
||||||
|
#include <sys/sysctl.h>
|
||||||
|
#endif
|
||||||
|
+#endif
|
||||||
|
#if HAVE_UNISTD_H
|
||||||
|
#include <unistd.h>
|
||||||
|
#endif
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
diff --git a/crypto/o_str.c b/crypto/o_str.c
|
||||||
|
index 8aadff5..ba427c9 100644
|
||||||
|
--- a/crypto/o_str.c
|
||||||
|
+++ b/crypto/o_str.c
|
||||||
|
@@ -385,7 +385,7 @@ int openssl_strerror_r(int errnum, char *buf, size_t buflen)
|
||||||
|
* It can return a pointer to some (immutable) static string in which case
|
||||||
|
* buf is left unused.
|
||||||
|
*/
|
||||||
|
- err = strerror_r(errnum, buf, buflen);
|
||||||
|
+ err = (char *)strerror_r(errnum, buf, buflen);
|
||||||
|
if (err == NULL || buflen == 0)
|
||||||
|
return 0;
|
||||||
|
/*
|
||||||
Vendored
+3
@@ -1,3 +1,6 @@
|
|||||||
|
// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
|
||||||
|
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
/* ===---------- emutls.c - Implements __emutls_get_address ---------------===
|
/* ===---------- emutls.c - Implements __emutls_get_address ---------------===
|
||||||
*
|
*
|
||||||
* The LLVM Compiler Infrastructure
|
* The LLVM Compiler Infrastructure
|
||||||
|
|||||||
@@ -229,6 +229,7 @@ if(CXX_CLANG)
|
|||||||
$<$<VERSION_LESS:$<CXX_COMPILER_VERSION>,15>:CANNOT_EXPLICITLY_INSTANTIATE>)
|
$<$<VERSION_LESS:$<CXX_COMPILER_VERSION>,15>:CANNOT_EXPLICITLY_INSTANTIATE>)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
# Has to be BEFORE httplib
|
||||||
if (BOOST_NO_HEADERS)
|
if (BOOST_NO_HEADERS)
|
||||||
target_link_libraries(common PUBLIC Boost::algorithm Boost::heap Boost::icl Boost::pool)
|
target_link_libraries(common PUBLIC Boost::algorithm Boost::heap Boost::icl Boost::pool)
|
||||||
else()
|
else()
|
||||||
|
|||||||
@@ -213,7 +213,7 @@ std::optional<std::string> MakeRequest(const std::string& url, const std::string
|
|||||||
client->set_read_timeout(timeout_seconds);
|
client->set_read_timeout(timeout_seconds);
|
||||||
client->set_write_timeout(timeout_seconds);
|
client->set_write_timeout(timeout_seconds);
|
||||||
|
|
||||||
#ifdef YUZU_BUNDLED_OPENSSL
|
#if defined(YUZU_BUNDLED_OPENSSL) && !defined(__OPENORBIS__)
|
||||||
client->load_ca_cert_store(kCert, sizeof(kCert));
|
client->load_ca_cert_store(kCert, sizeof(kCert));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
@@ -99,7 +99,7 @@ void UpdateDialog::Download() {
|
|||||||
client->set_read_timeout(timeout_seconds);
|
client->set_read_timeout(timeout_seconds);
|
||||||
client->set_write_timeout(timeout_seconds);
|
client->set_write_timeout(timeout_seconds);
|
||||||
|
|
||||||
#ifdef YUZU_BUNDLED_OPENSSL
|
#if defined(YUZU_BUNDLED_OPENSSL) && !defined(__OPENORBIS__)
|
||||||
client->load_ca_cert_store(kCert, sizeof(kCert));
|
client->load_ca_cert_store(kCert, sizeof(kCert));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user