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

Disable -fPIC when building for PlayStation Portable

Browse source 
The PSPDEV toolchain doesn't seem to support position independent code.
This commit is contained in:
刘皓 2025-01-16 11:49:11 -05:00
parent 0602c97a0a
commit 16f21ff043
No known key found for this signature in database
GPG key ID: 7901753DB465B711
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -831,7 +831,7 @@ jobs:
else else
lto_arg='-Db_lto=false' lto_arg='-Db_lto=false'
fi fi
meson setup build --cross-file ~/cross.ini -Ddefault_library=static --buildtype release $lto_arg -Dretro=true -Dretro_phase1_path=retro/build/retro-phase1 meson setup build --cross-file ~/cross.ini --default-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
@ -882,7 +882,7 @@ jobs:
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 meson setup build --cross-file ~/cross.ini --default-library static --buildtype release -Db_lto=true -Dretro=true -Dretro_phase1_path=retro/build/retro-phase1
cd build cd build
ninja -v ninja -v
mips64r5900el-ps2-elf-strip libretro-mkxp-z.a mips64r5900el-ps2-elf-strip libretro-mkxp-z.a
@ -933,7 +933,7 @@ jobs:
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 meson setup build --cross-file ~/cross.ini --default-library static -Db_staticpic=false --buildtype release -Db_lto=true -Dretro=true -Dretro_phase1_path=retro/build/retro-phase1
cd build cd build
ninja -v ninja -v
psp-strip libretro-mkxp-z.a psp-strip libretro-mkxp-z.a

12
meson.build
View file

@ -37,20 +37,20 @@ if get_option('retro') == true
boost_options = cmake.subproject_options() boost_options = cmake.subproject_options()
boost_options.add_cmake_defines({ boost_options.add_cmake_defines({
'CMAKE_POSITION_INDEPENDENT_CODE': true, 'CMAKE_POSITION_INDEPENDENT_CODE': get_option('b_staticpic'),
'BUILD_TESTING': false, 'BUILD_TESTING': false,
}) })
zlib_options = cmake.subproject_options() zlib_options = cmake.subproject_options()
zlib_options.add_cmake_defines({ zlib_options.add_cmake_defines({
'CMAKE_POSITION_INDEPENDENT_CODE': true, 'CMAKE_POSITION_INDEPENDENT_CODE': get_option('b_staticpic'),
'BUILD_SHARED_LIBS': false, 'BUILD_SHARED_LIBS': false,
'ZLIB_BUILD_EXAMPLES': false, 'ZLIB_BUILD_EXAMPLES': false,
}) })
bzip2_options = cmake.subproject_options() bzip2_options = cmake.subproject_options()
bzip2_options.add_cmake_defines({ bzip2_options.add_cmake_defines({
'CMAKE_POSITION_INDEPENDENT_CODE': true, 'CMAKE_POSITION_INDEPENDENT_CODE': get_option('b_staticpic'),
'CMAKE_BUILD_TYPE': 'None', 'CMAKE_BUILD_TYPE': 'None',
'ENABLE_STATIC_LIB': true, 'ENABLE_STATIC_LIB': true,
'ENABLE_SHARED_LIB': false, 'ENABLE_SHARED_LIB': false,
@ -59,7 +59,7 @@ if get_option('retro') == true
liblzma_options = cmake.subproject_options() liblzma_options = cmake.subproject_options()
liblzma_options.add_cmake_defines({ liblzma_options.add_cmake_defines({
'CMAKE_POSITION_INDEPENDENT_CODE': true, 'CMAKE_POSITION_INDEPENDENT_CODE': get_option('b_staticpic'),
'BUILD_SHARED_LIBS': false, 'BUILD_SHARED_LIBS': false,
'ENABLE_NLS': false, 'ENABLE_NLS': false,
'ENABLE_THREADS': 'OFF', 'ENABLE_THREADS': 'OFF',
@ -67,7 +67,7 @@ if get_option('retro') == true
zstd_options = cmake.subproject_options() zstd_options = cmake.subproject_options()
zstd_options.add_cmake_defines({ zstd_options.add_cmake_defines({
'CMAKE_POSITION_INDEPENDENT_CODE': true, 'CMAKE_POSITION_INDEPENDENT_CODE': get_option('b_staticpic'),
'ZSTD_BUILD_STATIC': true, 'ZSTD_BUILD_STATIC': true,
'ZSTD_BUILD_SHARED': false, 'ZSTD_BUILD_SHARED': false,
'ZSTD_BUILD_PROGRAMS': false, 'ZSTD_BUILD_PROGRAMS': false,
@ -79,7 +79,7 @@ if get_option('retro') == true
libzip_options = cmake.subproject_options() libzip_options = cmake.subproject_options()
libzip_options.add_cmake_defines({ libzip_options.add_cmake_defines({
'CMAKE_POSITION_INDEPENDENT_CODE': true, 'CMAKE_POSITION_INDEPENDENT_CODE': get_option('b_staticpic'),
'BUILD_SHARED_LIBS': false, 'BUILD_SHARED_LIBS': false,
'LIBZIP_DO_INSTALL': false, 'LIBZIP_DO_INSTALL': false,
'BUILD_TOOLS': false, 'BUILD_TOOLS': false,