mirrors/mkxp-z
1
0
Fork 0
mirror of https://github.com/mkxp-z/mkxp-z.git synced 2025-08-26 08:43:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix dependency compilation errors when compiling for Nintendo consoles

Browse source
This commit is contained in:
刘皓 2025-01-16 01:33:44 -05:00
parent 44b8d13ff8
commit 0602c97a0a
No known key found for this signature in database
GPG key ID: 7901753DB465B711
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
.github/workflows/autobuild.yml vendored
View file

@ -593,6 +593,7 @@ jobs:
echo "endian = '${{ matrix.endian }}'" | tee -a ${{ runner.temp }}/cross.ini echo "endian = '${{ matrix.endian }}'" | tee -a ${{ runner.temp }}/cross.ini
echo "[properties]" | tee -a ${{ runner.temp }}/cross.ini echo "[properties]" | tee -a ${{ runner.temp }}/cross.ini
echo "sys_root = '${{ steps.sysroot.outputs.root-path }}'" | tee -a ${{ runner.temp }}/cross.ini echo "sys_root = '${{ steps.sysroot.outputs.root-path }}'" | tee -a ${{ runner.temp }}/cross.ini
echo '--------------------------------------------------------------------------------'
mkdir ${{ runner.temp }}/retro-phase2 mkdir ${{ runner.temp }}/retro-phase2
cp retro/core.info ${{ runner.temp }}/retro-phase2/libretro-mkxp-z.info cp retro/core.info ${{ runner.temp }}/retro-phase2/libretro-mkxp-z.info
@ -678,6 +679,7 @@ jobs:
echo "endian = '${{ matrix.endian }}'" | tee -a ${{ runner.temp }}/cross.ini echo "endian = '${{ matrix.endian }}'" | tee -a ${{ runner.temp }}/cross.ini
echo "[cmake]" | tee -a ${{ runner.temp }}/cross.ini echo "[cmake]" | tee -a ${{ runner.temp }}/cross.ini
echo "CMAKE_SYSTEM_PROCESSOR = '${{ matrix.arch_cmake }}'" | tee -a ${{ runner.temp }}/cross.ini echo "CMAKE_SYSTEM_PROCESSOR = '${{ matrix.arch_cmake }}'" | tee -a ${{ runner.temp }}/cross.ini
echo '--------------------------------------------------------------------------------'
mkdir ${{ runner.temp }}/retro-phase2 mkdir ${{ runner.temp }}/retro-phase2
cp retro/core.info ${{ runner.temp }}/retro-phase2/libretro-mkxp-z.info cp retro/core.info ${{ runner.temp }}/retro-phase2/libretro-mkxp-z.info
@ -745,6 +747,7 @@ jobs:
echo "cpu_family = '${{ matrix.cpu_family }}'" | tee -a ${{ runner.temp }}/cross.ini echo "cpu_family = '${{ matrix.cpu_family }}'" | tee -a ${{ runner.temp }}/cross.ini
echo "cpu = '${{ matrix.cpu }}'" | tee -a ${{ runner.temp }}/cross.ini echo "cpu = '${{ matrix.cpu }}'" | tee -a ${{ runner.temp }}/cross.ini
echo "endian = '${{ matrix.endian }}'" | tee -a ${{ runner.temp }}/cross.ini echo "endian = '${{ matrix.endian }}'" | tee -a ${{ runner.temp }}/cross.ini
echo '--------------------------------------------------------------------------------'
mkdir ${{ runner.temp }}/retro-phase2 mkdir ${{ runner.temp }}/retro-phase2
cp retro/core.info ${{ runner.temp }}/retro-phase2/libretro-mkxp-z.info cp retro/core.info ${{ runner.temp }}/retro-phase2/libretro-mkxp-z.info
@ -803,7 +806,7 @@ jobs:
- name: Install dependencies - name: Install dependencies
run: | run: |
apt update apt update
apt install -y git python pip ninja-build cmake apt install -y git build-essential pip ninja-build cmake
pip install meson pip install meson
- name: Build phase 2 - name: Build phase 2
@ -818,10 +821,17 @@ jobs:
echo "cpu_family = '${{ matrix.cpu_family }}'" | tee -a ~/cross.ini echo "cpu_family = '${{ matrix.cpu_family }}'" | tee -a ~/cross.ini
echo "cpu = '${{ matrix.cpu }}'" | tee -a ~/cross.ini echo "cpu = '${{ matrix.cpu }}'" | tee -a ~/cross.ini
echo "endian = '${{ matrix.endian }}'" | tee -a ~/cross.ini echo "endian = '${{ matrix.endian }}'" | tee -a ~/cross.ini
echo '--------------------------------------------------------------------------------'
mkdir ~/retro-phase2 mkdir ~/retro-phase2
cp retro/core.info ~/retro-phase2/libretro-mkxp-z.info cp retro/core.info ~/retro-phase2/libretro-mkxp-z.info
meson setup build --cross-file ~/cross.ini -Ddefault_library=static --buildtype release -Db_lto=true -Dretro=true -Dretro_phase1_path=retro/build/retro-phase1 if [ '${{ matrix.arch_devkitpro }}' != 'a64' ] # Enabling LTO with devkitA64 causes "plugin needed to handle lto object" linker error
then
lto_arg='-Db_lto=true'
else
lto_arg='-Db_lto=false'
fi
meson setup build --cross-file ~/cross.ini -Ddefault_library=static --buildtype release $lto_arg -Dretro=true -Dretro_phase1_path=retro/build/retro-phase1
cd build cd build
ninja -v ninja -v
/opt/devkitpro/devkit$(echo ${{ matrix.arch_devkitpro }} | tr a-z A-Z)/bin/${{ matrix.arch_gcc }}-strip libretro-mkxp-z.a /opt/devkitpro/devkit$(echo ${{ matrix.arch_devkitpro }} | tr a-z A-Z)/bin/${{ matrix.arch_gcc }}-strip libretro-mkxp-z.a
@ -854,7 +864,7 @@ jobs:
- name: Install dependencies - name: Install dependencies
run: | run: |
apk update apk update
apk add git meson cmake apk add git build-base meson cmake
- name: Build phase 2 - name: Build phase 2
run: | run: |
@ -868,6 +878,7 @@ jobs:
echo "cpu_family = 'mips64'" | tee -a ~/cross.ini echo "cpu_family = 'mips64'" | tee -a ~/cross.ini
echo "cpu = 'mips64el'" | tee -a ~/cross.ini echo "cpu = 'mips64el'" | tee -a ~/cross.ini
echo "endian = 'little'" | tee -a ~/cross.ini echo "endian = 'little'" | tee -a ~/cross.ini
echo '--------------------------------------------------------------------------------'
mkdir ~/retro-phase2 mkdir ~/retro-phase2
cp retro/core.info ~/retro-phase2/libretro-mkxp-z.info cp retro/core.info ~/retro-phase2/libretro-mkxp-z.info
@ -904,7 +915,7 @@ jobs:
- name: Install dependencies - name: Install dependencies
run: | run: |
apk update apk update
apk add git meson cmake apk add git build-base meson cmake
- name: Build phase 2 - name: Build phase 2
run: | run: |
@ -918,6 +929,7 @@ jobs:
echo "cpu_family = 'mips64'" | tee -a ~/cross.ini echo "cpu_family = 'mips64'" | tee -a ~/cross.ini
echo "cpu = 'mips64el'" | tee -a ~/cross.ini echo "cpu = 'mips64el'" | tee -a ~/cross.ini
echo "endian = 'little'" | tee -a ~/cross.ini echo "endian = 'little'" | tee -a ~/cross.ini
echo '--------------------------------------------------------------------------------'
mkdir ~/retro-phase2 mkdir ~/retro-phase2
cp retro/core.info ~/retro-phase2/libretro-mkxp-z.info cp retro/core.info ~/retro-phase2/libretro-mkxp-z.info

1
meson.build
View file

@ -74,6 +74,7 @@ if get_option('retro') == true
'ZSTD_BUILD_TESTS': false, 'ZSTD_BUILD_TESTS': false,
'ZSTD_BUILD_CONTRIB': false, 'ZSTD_BUILD_CONTRIB': false,
'ZSTD_MULTITHREAD_SUPPORT': false, 'ZSTD_MULTITHREAD_SUPPORT': false,
'ZSTD_LEGACY_SUPPORT': false,
}) })
libzip_options = cmake.subproject_options() libzip_options = cmake.subproject_options()