Archive/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-28 13:28:01 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into rsx-volatile

Browse source
This commit is contained in:
Ani 2025-04-27 02:03:46 +02:00 • committed by GitHub
commit 1bb86d4b9a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
.ci/build-linux-aarch64.sh
View file

@ -22,15 +22,16 @@ else
export CXX="${CLANGXX_BINARY}" export CXX="${CLANGXX_BINARY}"
export LINKER="${LLD_BINARY}" export LINKER="${LLD_BINARY}"
fi fi
export CFLAGS="$CFLAGS -fuse-ld=${LINKER}"
export CXXFLAGS="$CXXFLAGS -fuse-ld=${LINKER}" export LINKER_FLAG="-fuse-ld=${LINKER}"
cmake .. \ cmake .. \
-DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_PREFIX=/usr \
-DUSE_NATIVE_INSTRUCTIONS=OFF \ -DUSE_NATIVE_INSTRUCTIONS=OFF \
-DUSE_PRECOMPILED_HEADERS=OFF \ -DUSE_PRECOMPILED_HEADERS=OFF \
-DCMAKE_C_FLAGS="$CFLAGS" \ -DCMAKE_EXE_LINKER_FLAGS="${LINKER_FLAG}" \
-DCMAKE_CXX_FLAGS="$CFLAGS" \ -DCMAKE_MODULE_LINKER_FLAGS="${LINKER_FLAG}" \
-DCMAKE_SHARED_LINKER_FLAGS="${LINKER_FLAG}" \
-DUSE_SYSTEM_CURL=ON \ -DUSE_SYSTEM_CURL=ON \
-DUSE_SDL=ON \ -DUSE_SDL=ON \
-DUSE_SYSTEM_SDL=ON \ -DUSE_SYSTEM_SDL=ON \

5
.ci/build-linux.sh
View file

@ -30,7 +30,7 @@ else
export RANLIB=/usr/bin/llvm-ranlib-"$LLVMVER" export RANLIB=/usr/bin/llvm-ranlib-"$LLVMVER"
fi fi
export CFLAGS="$CFLAGS -fuse-ld=${LINKER}" export LINKER_FLAG="-fuse-ld=${LINKER}"
cmake .. \ cmake .. \
-DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_PREFIX=/usr \
@ -38,6 +38,9 @@ cmake .. \
-DUSE_PRECOMPILED_HEADERS=OFF \ -DUSE_PRECOMPILED_HEADERS=OFF \
-DCMAKE_C_FLAGS="$CFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \
-DCMAKE_CXX_FLAGS="$CFLAGS" \ -DCMAKE_CXX_FLAGS="$CFLAGS" \
-DCMAKE_EXE_LINKER_FLAGS="${LINKER_FLAG}" \
-DCMAKE_MODULE_LINKER_FLAGS="${LINKER_FLAG}" \
-DCMAKE_SHARED_LINKER_FLAGS="${LINKER_FLAG}" \
-DCMAKE_AR="$AR" \ -DCMAKE_AR="$AR" \
-DCMAKE_RANLIB="$RANLIB" \ -DCMAKE_RANLIB="$RANLIB" \
-DUSE_SYSTEM_CURL=ON \ -DUSE_SYSTEM_CURL=ON \

2
3rdparty/miniupnp/miniupnp vendored

@ -1 +1 @@
Subproject commit 7f189988a0decca0ab7da89000051ab91751f70d Subproject commit d66872e34d9ff83a07f8b71371b13419b2089953

2
3rdparty/wolfssl/wolfssl vendored

@ -1 +1 @@
Subproject commit 239b85c80438bf60d9a5b9e0ebe9ff097a760d0d Subproject commit b077c81eb635392e694ccedbab8b644297ec0285

3
buildfiles/cmake/ConfigureCompiler.cmake
View file

@ -93,6 +93,9 @@ else()
add_compile_options(-Wno-class-memaccess) add_compile_options(-Wno-class-memaccess)
endif() endif()
# Note that this refers to binary size optimization during linking, it differs from optimization compiler level
add_link_options(-Wl,-O2)
if(NOT APPLE AND NOT WIN32) if(NOT APPLE AND NOT WIN32)
# This hides our LLVM from mesa's LLVM, otherwise we get some unresolvable conflicts. # This hides our LLVM from mesa's LLVM, otherwise we get some unresolvable conflicts.
add_link_options(-Wl,--exclude-libs,ALL) add_link_options(-Wl,--exclude-libs,ALL)