diff options
| author | rsn8887 | 2019-05-07 16:24:07 -0500 |
|---|---|---|
| committer | Filippos Karapetis | 2019-05-12 11:59:44 +0300 |
| commit | 30ee1f2cdc6c721f3a46a5acd167e0cd5c498411 (patch) | |
| tree | 0d5eb557c0bf98ea622b88e20be1fb679bd583c9 | |
| parent | 875bc0b1c21aac75e55947ff421f2a8cc9f36c29 (diff) | |
| download | scummvm-rg350-30ee1f2cdc6c721f3a46a5acd167e0cd5c498411.tar.gz scummvm-rg350-30ee1f2cdc6c721f3a46a5acd167e0cd5c498411.tar.bz2 scummvm-rg350-30ee1f2cdc6c721f3a46a5acd167e0cd5c498411.zip | |
Switch: fix version, remove redundant settings and unneeded defines
| -rw-r--r-- | backends/platform/sdl/switch/switch-main.cpp | 3 | ||||
| -rw-r--r-- | backends/platform/sdl/switch/switch.cpp | 2 | ||||
| -rw-r--r-- | backends/platform/sdl/switch/switch.mk | 2 | ||||
| -rwxr-xr-x | configure | 8 |
4 files changed, 1 insertions, 14 deletions
diff --git a/backends/platform/sdl/switch/switch-main.cpp b/backends/platform/sdl/switch/switch-main.cpp index a44b2fb76e..0cc48ba0cd 100644 --- a/backends/platform/sdl/switch/switch-main.cpp +++ b/backends/platform/sdl/switch/switch-main.cpp @@ -22,9 +22,6 @@ #include <switch.h> -#define FORBIDDEN_SYMBOL_EXCEPTION_stdout -#define FORBIDDEN_SYMBOL_EXCEPTION_stderr - #include "common/scummsys.h" #include "backends/platform/sdl/switch/switch.h" #include "backends/plugins/sdl/sdl-provider.h" diff --git a/backends/platform/sdl/switch/switch.cpp b/backends/platform/sdl/switch/switch.cpp index 391b101aa2..e859fdd125 100644 --- a/backends/platform/sdl/switch/switch.cpp +++ b/backends/platform/sdl/switch/switch.cpp @@ -21,9 +21,7 @@ */ #define FORBIDDEN_SYMBOL_EXCEPTION_printf -#define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h -#include <sys/stat.h> #include "common/scummsys.h" #include "common/config-manager.h" #include "backends/platform/sdl/switch/switch.h" diff --git a/backends/platform/sdl/switch/switch.mk b/backends/platform/sdl/switch/switch.mk index 998333e3f8..376b59f01c 100644 --- a/backends/platform/sdl/switch/switch.mk +++ b/backends/platform/sdl/switch/switch.mk @@ -1,7 +1,7 @@ scummvm.nro: $(EXECUTABLE) mkdir -p ./switch_release/scummvm/data mkdir -p ./switch_release/scummvm/doc - nacptool --create "ScummVM" "Cpasjuste" "2.12" ./switch_release/scummvm.nacp + nacptool --create "ScummVM" "Cpasjuste" "$(VERSION)" ./switch_release/scummvm.nacp elf2nro $(EXECUTABLE) ./switch_release/scummvm/scummvm.nro --icon=$(srcdir)/dists/switch/icon.jpg --nacp=./switch_release/scummvm.nacp scummvm_switch.zip: scummvm.nro @@ -1694,7 +1694,6 @@ switch) datarootdir='${prefix}/data' datadir='${datarootdir}' docdir='${prefix}/doc' - PKG_CONFIG_LIBDIR=$DEVKITPRO/portlibs/switch/lib/pkgconfig ;; tizen) _host_os=tizen @@ -3404,14 +3403,7 @@ if test -n "$_host"; then switch) _backend="switch" _opengl_mode=gles2 - _build_scalers=yes - _build_hq_scalers=yes - _dynamic_modules=no _vkeybd=yes - _mt32emu=yes - _vorbis=yes - _tremor=no - _eventrec=no _port_mk="backends/platform/sdl/switch/switch.mk" ;; tizen) |