Compare commits

..

1 Commits

Author SHA1 Message Date
crueter f801b5113b revert a9c4c8aefd
revert [common/dynamic_library] fix AUR build error (#4156)

not gonna question why there was an ifdef there

Signed-off-by: lizzie <lizzie@eden-emu.dev>

Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4156
Reviewed-by: CamilleLaVey <camillelavey99@gmail.com>
Reviewed-by: MaranBr <maranbr@eden-emu.dev>
2026-07-02 19:52:27 +02:00
3 changed files with 10 additions and 13 deletions
+3 -2
View File
@@ -460,8 +460,9 @@ AddJsonPackage(nlohmann)
if (NOT YUZU_STATIC_ROOM)
# zlib
AddJsonPackage(zlib)
if (NOT TARGET ZLIB::ZLIB)
add_library(ZLIB::ZLIB ALIAS zlib-ng)
if (ZLIB_ADDED)
add_library(ZLIB::ZLIB ALIAS zlibstatic)
endif()
# Opus
+7 -7
View File
@@ -378,16 +378,16 @@
"version": "7.35.2"
},
"zlib": {
"hash": "e2057c764f1d5aaee738edee7e977182c5b097e3c95489dcd8de813f237d92a05daaa86d68d44b331d9fec5d1802586a8f6cfb658ba849874aaa14e72a8107f5",
"hash": "16fea4df307a68cf0035858abe2fd550250618a97590e202037acd18a666f57afc10f8836cbbd472d54a0e76539d0e558cb26f059d53de52ff90634bbf4f47d4",
"min_version": "1.2",
"options": [
"ZLIB_COMPAT ON",
"ZLIB_ALIASES ON",
"BUILD_SHARED_LIBS OFF"
"ZLIB_BUILD_SHARED OFF",
"ZLIB_INSTALL OFF"
],
"package": "ZLIB",
"repo": "zlib-ng/zlib-ng",
"tag": "%VERSION%",
"version": "2.3.3"
"repo": "madler/zlib",
"tag": "v%VERSION%",
"version": "1.3.2"
},
"zstd": {
"find_args": "MODULE",
-4
View File
@@ -5,11 +5,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later
#include <string>
#ifndef _WIN32
#include <cstring>
#endif
#include <utility>
#include <fmt/ranges.h>