diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml
index 143c61b7..9ebe7e47 100644
--- a/.github/workflows/autobuild.yml
+++ b/.github/workflows/autobuild.yml
@@ -831,7 +831,7 @@ jobs:
           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
+          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
           ninja -v
           /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
           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
           ninja -v
           mips64r5900el-ps2-elf-strip libretro-mkxp-z.a
@@ -933,7 +933,7 @@ jobs:
 
           mkdir ~/retro-phase2
           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
           ninja -v
           psp-strip libretro-mkxp-z.a
diff --git a/meson.build b/meson.build
index 89331ddb..ecefc673 100644
--- a/meson.build
+++ b/meson.build
@@ -37,20 +37,20 @@ if get_option('retro') == true
 
     boost_options = cmake.subproject_options()
     boost_options.add_cmake_defines({
-        'CMAKE_POSITION_INDEPENDENT_CODE': true,
+        'CMAKE_POSITION_INDEPENDENT_CODE': get_option('b_staticpic'),
         'BUILD_TESTING': false,
     })
 
     zlib_options = cmake.subproject_options()
     zlib_options.add_cmake_defines({
-        'CMAKE_POSITION_INDEPENDENT_CODE': true,
+        'CMAKE_POSITION_INDEPENDENT_CODE': get_option('b_staticpic'),
         'BUILD_SHARED_LIBS': false,
         'ZLIB_BUILD_EXAMPLES': false,
     })
 
     bzip2_options = cmake.subproject_options()
     bzip2_options.add_cmake_defines({
-        'CMAKE_POSITION_INDEPENDENT_CODE': true,
+        'CMAKE_POSITION_INDEPENDENT_CODE': get_option('b_staticpic'),
         'CMAKE_BUILD_TYPE': 'None',
         'ENABLE_STATIC_LIB': true,
         'ENABLE_SHARED_LIB': false,
@@ -59,7 +59,7 @@ if get_option('retro') == true
 
     liblzma_options = cmake.subproject_options()
     liblzma_options.add_cmake_defines({
-        'CMAKE_POSITION_INDEPENDENT_CODE': true,
+        'CMAKE_POSITION_INDEPENDENT_CODE': get_option('b_staticpic'),
         'BUILD_SHARED_LIBS': false,
         'ENABLE_NLS': false,
         'ENABLE_THREADS': 'OFF',
@@ -67,7 +67,7 @@ if get_option('retro') == true
 
     zstd_options = cmake.subproject_options()
     zstd_options.add_cmake_defines({
-        'CMAKE_POSITION_INDEPENDENT_CODE': true,
+        'CMAKE_POSITION_INDEPENDENT_CODE': get_option('b_staticpic'),
         'ZSTD_BUILD_STATIC': true,
         'ZSTD_BUILD_SHARED': false,
         'ZSTD_BUILD_PROGRAMS': false,
@@ -79,7 +79,7 @@ if get_option('retro') == true
 
     libzip_options = cmake.subproject_options()
     libzip_options.add_cmake_defines({
-        'CMAKE_POSITION_INDEPENDENT_CODE': true,
+        'CMAKE_POSITION_INDEPENDENT_CODE': get_option('b_staticpic'),
         'BUILD_SHARED_LIBS': false,
         'LIBZIP_DO_INSTALL': false,
         'BUILD_TOOLS': false,