From 5b6fb7f7e17ea74ccef3d703ca42ffdbf31b91a9 Mon Sep 17 00:00:00 2001 From: neonloop Date: Wed, 21 Apr 2021 01:01:51 +0000 Subject: Initial trimui model s support --- backends/platform/dingux/build.trimui.sh | 3 +++ backends/platform/dingux/dingux.mk | 24 ++++++++++++++++++++++++ backends/platform/sdl/sdl.cpp | 2 ++ 3 files changed, 29 insertions(+) create mode 100755 backends/platform/dingux/build.trimui.sh (limited to 'backends/platform') diff --git a/backends/platform/dingux/build.trimui.sh b/backends/platform/dingux/build.trimui.sh new file mode 100755 index 0000000000..5b38e7e3a5 --- /dev/null +++ b/backends/platform/dingux/build.trimui.sh @@ -0,0 +1,3 @@ +#!/bin/bash + + ../../../configure --host=trimui --with-mad-prefix=/opt/trimui-toolchain/arm-buildroot-linux-gnueabi/sysroot/usr --enable-plugins --default-dynamic --disable-all-unstable-engines --disable-flac --disable-debug --disable-highres --enable-release --disable-hq-scalers --disable-mt32emu --disable-lua --disable-nuked-opl && make && make trimui-dist diff --git a/backends/platform/dingux/dingux.mk b/backends/platform/dingux/dingux.mk index 0ecd1c2ed2..1d38e7511e 100644 --- a/backends/platform/dingux/dingux.mk +++ b/backends/platform/dingux/dingux.mk @@ -3,6 +3,7 @@ DINGUX_EXE_STRIPPED := scummvm_stripped$(EXEEXT) bundle_name = dingux-dist/scummvm gcw0_bundle = gcw0-opk miyoo_compile = /opt/miyoo/usr/bin/arm-linux-strip +trimui_strip = $(CROSS_COMPILE)strip f=$(shell which $(STRIP)) libloc = $(shell dirname $(f)) @@ -64,6 +65,29 @@ endif $(CP) $(srcdir)/backends/platform/dingux/README.MIYOO $(bundle_name)/ $(CP) $(srcdir)/backends/platform/dingux/scummvm.png $(bundle_name)/ +trimui-dist: all + $(MKDIR) $(bundle_name) + $(trimui_strip) $(EXECUTABLE) -o $(bundle_name)/scummvm.elf + $(CP) $(DIST_FILES_THEMES) $(bundle_name)/ +ifdef DIST_FILES_ENGINEDATA + $(CP) $(DIST_FILES_ENGINEDATA) $(bundle_name)/ +endif +ifdef DIST_FILES_NETWORKING + $(CP) $(DIST_FILES_NETWORKING) $(bundle_name)/ +endif +ifdef DIST_FILES_VKEYBD + $(CP) $(DIST_FILES_VKEYBD) $(bundle_name)/ +endif + $(CP) $(DIST_FILES_DOCS) $(bundle_name)/ +ifdef DYNAMIC_MODULES + $(MKDIR) $(bundle_name)/plugins + $(CP) $(PLUGINS) $(bundle_name)/plugins + $(trimui_strip) $(bundle_name)/plugins/* +endif + + $(CP) $(srcdir)/backends/platform/dingux/README.MIYOO $(bundle_name)/ + $(CP) $(srcdir)/backends/platform/dingux/scummvm.png $(bundle_name)/ + # Special target for generationg GCW-Zero OPK bundle $(gcw0_bundle): all GeneralUser\ GS\ FluidSynth\ v1.44.sf2 $(MKDIR) $(gcw0_bundle) diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp index b3436dbef8..c0414fc9ed 100644 --- a/backends/platform/sdl/sdl.cpp +++ b/backends/platform/sdl/sdl.cpp @@ -149,8 +149,10 @@ void OSystem_SDL::init() { // Disable OS cursor SDL_ShowCursor(SDL_DISABLE); +#ifndef TRIMUI if (!_logger) _logger = new Backends::Log::Log(this); +#endif if (_logger) { Common::WriteStream *logFile = createLogFile(); -- cgit v1.2.3