[Scummvm-git-logs] scummvm master -> 84b91c17975446f43205cd057a5b1d7e0858e761

[digitall]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
e7cb178feb 3DS: Fix building outside the main source directory
ae25843ea7 3DS: Remove unnecessary include
84b91c1797 3DS: Fix typos


Commit: e7cb178feb9993e37230aa67223082b6b8858996
    https://github.com/scummvm/scummvm/commit/e7cb178feb9993e37230aa67223082b6b8858996
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2018-11-21T15:36:24Z

Commit Message:
3DS: Fix building outside the main source directory

Changed paths:
    backends/platform/3ds/3ds.mk


diff --git a/backends/platform/3ds/3ds.mk b/backends/platform/3ds/3ds.mk
index b896193..7cb162f 100644
--- a/backends/platform/3ds/3ds.mk
+++ b/backends/platform/3ds/3ds.mk
@@ -3,11 +3,11 @@ TARGET := scummvm
 APP_TITLE       := ScummVM
 APP_DESCRIPTION := Point-and-click adventure game engines
 APP_AUTHOR      := ScummVM Team
-APP_ICON        := backends/platform/3ds/app/icon.png
+APP_ICON        := $(srcdir)/backends/platform/3ds/app/icon.png
 
-APP_RSF         := backends/platform/3ds/app/scummvm.rsf
-APP_BANNER_IMAGE:= backends/platform/3ds/app/banner.png
-APP_BANNER_AUDIO:= backends/platform/3ds/app/banner.wav
+APP_RSF         := $(srcdir)/backends/platform/3ds/app/scummvm.rsf
+APP_BANNER_IMAGE:= $(srcdir)/backends/platform/3ds/app/banner.png
+APP_BANNER_AUDIO:= $(srcdir)/backends/platform/3ds/app/banner.wav
 
 ARCH     := -march=armv6k -mtune=mpcore -mfloat-abi=hard -mtp=soft
 CXXFLAGS += -std=gnu++11
@@ -51,6 +51,10 @@ define shader-as
 	echo "extern const u32" `(echo $(FILE) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`_size";" >> `(echo $(FILEPATH) | tr . _)`.h
 endef
 
+vpath %.v.pica $(srcdir)
+vpath %.g.pica $(srcdir)
+vpath %.shlist $(srcdir)
+
 %.shbin.o : %.v.pica %.g.pica
 	@echo $(notdir $^)
 	@$(call shader-as,$^)


Commit: ae25843ea7217b7fce2248419a748b0d7d1ebf9a
    https://github.com/scummvm/scummvm/commit/ae25843ea7217b7fce2248419a748b0d7d1ebf9a
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2018-11-21T15:36:24Z

Commit Message:
3DS: Remove unnecessary include

Changed paths:
    backends/platform/3ds/options-dialog.cpp


diff --git a/backends/platform/3ds/options-dialog.cpp b/backends/platform/3ds/options-dialog.cpp
index 080ef29..a6be649 100644
--- a/backends/platform/3ds/options-dialog.cpp
+++ b/backends/platform/3ds/options-dialog.cpp
@@ -29,7 +29,6 @@
 #include "gui/widgets/list.h"
 #include "gui/widgets/tab.h"
 #include "osystem.h"
-#include "engines/scumm/scumm.h"
 #include "gui/widgets/popup.h"
 
 #include "common/translation.h"


Commit: 84b91c17975446f43205cd057a5b1d7e0858e761
    https://github.com/scummvm/scummvm/commit/84b91c17975446f43205cd057a5b1d7e0858e761
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2018-11-21T15:36:24Z

Commit Message:
3DS: Fix typos

Changed paths:
    backends/platform/3ds/README.md


diff --git a/backends/platform/3ds/README.md b/backends/platform/3ds/README.md
index a864dee..966708d 100644
--- a/backends/platform/3ds/README.md
+++ b/backends/platform/3ds/README.md
@@ -56,7 +56,7 @@ card so that all files reside in the `/3ds/scummvm/` directory.
 1.3) Additional files
 ---------------------
 In order to use the Virtual Keyboard, you need to get the:
-`backends/vkeybd/packs/vkeybd_zmall.zip` file from ScummVM's repository, and
+`backends/vkeybd/packs/vkeybd_small.zip` file from ScummVM's repository, and
 place it on your SD card, in the `/3ds/scummvm/kb` folder.
 
 In case you want a translated GUI, you need to get the:
@@ -238,7 +238,7 @@ The above configuration command will include all game engines by default and wil
 likely be too massive to be stable using either the 3DSX or the CIA format.
 Until dynamic modules are figured out, you should configure engines like this:
 ```
- $ ./configure --host=3ds --disable-all-engines--enable-engine=scumm-7-8,myst,riven, \
+ $ ./configure --host=3ds --disable-all-engines --enable-engine=scumm-7-8,myst,riven, \
      sword1,sword2,sword25,sci,lure,sky,agi,agos
 ```
 Choose whatever engines you want, but if the ELF's .text section exceeds ~10MB-12MB,