diff --git a/CMake/retrofw_defs.cmake b/CMake/retrofw_defs.cmake index 517b2aa26..08e0d4222 100644 --- a/CMake/retrofw_defs.cmake +++ b/CMake/retrofw_defs.cmake @@ -1,4 +1,4 @@ -set(sodium_USE_STATIC_LIBS ON) +set(NONET ON) set(USE_SDL1 ON) set(PREFILL_PLAYER_NAME ON) set(HAS_KBCTRL 1) diff --git a/Packaging/OpenDingux/build.sh b/Packaging/OpenDingux/build.sh index 0e4e64d2d..ae7bd4262 100755 --- a/Packaging/OpenDingux/build.sh +++ b/Packaging/OpenDingux/build.sh @@ -59,16 +59,11 @@ prepare_buildroot() { make_buildroot() { cp buildroot_${TARGET}_defconfig "$BUILDROOT/configs/${TARGET}_devilutionx_defconfig" cd "$BUILDROOT" - if [[ "$TARGET" != "rg350" ]]; then - if ! grep 'enable-static' package/libsodium/libsodium.mk > /dev/null; then - echo 'LIBSODIUM_CONF_OPTS += --enable-static' >> package/libsodium/libsodium.mk - fi - fi make ${TARGET}_devilutionx_defconfig if [[ "$TARGET" == "rg350" ]]; then BR2_JLEVEL=0 make else - BR2_JLEVEL=0 make toolchain libsodium libzip sdl sdl_mixer sdl_ttf + BR2_JLEVEL=0 make toolchain libzip sdl sdl_mixer sdl_ttf fi cd - }