[Scummvm-git-logs] scummvm master -> 2638e6b2a0fcdba5e358f081571922fdd15cd4af
sev-
noreply at scummvm.org
Wed Dec 14 11:17:45 UTC 2022
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:
923c1be2c7 CONFIGURE: Set CXX/AS/AR/RANLIB automatically on 3DS
e34c41eaaa 3DS: Add explicit path to picasso, bin2s and co
2638e6b2a0 3DS: Make path to bannertool and makerom configurable.
Commit: 923c1be2c7dec10fe2971e3284985b8e4512a03a
https://github.com/scummvm/scummvm/commit/923c1be2c7dec10fe2971e3284985b8e4512a03a
Author: Vladimir Serbinenko (phcoder at gmail.com)
Date: 2022-12-14T12:17:39+01:00
Commit Message:
CONFIGURE: Set CXX/AS/AR/RANLIB automatically on 3DS
This is not strictly necesarry but makes configuration simpler
Changed paths:
configure
diff --git a/configure b/configure
index 258bd8fa50e..aa2fedf4db9 100755
--- a/configure
+++ b/configure
@@ -1794,7 +1794,27 @@ android)
exit 1
fi
;;
-3ds | ds | gamecube | switch | wii)
+3ds)
+ if test -z "$DEVKITPRO"; then
+ echo "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to devkitPRO>"
+ exit 1
+ fi
+ _as="$DEVKITPRO/devkitARM/bin/arm-none-eabi-as"
+ _ar="$DEVKITPRO/devkitARM/bin/arm-none-eabi-ar cr"
+ _ranlib="$DEVKITPRO/devkitARM/bin/arm-none-eabi-ranlib"
+ _strip="$DEVKITPRO/devkitARM/bin/arm-none-eabi-strip"
+ if test -z "$CXX"; then
+ CXX="$DEVKITPRO/devkitARM/bin/arm-none-eabi-g++"
+ fi
+ if test -z "$PKG_CONFIG_LIBDIR"; then
+ PKG_CONFIG_LIBDIR="$DEVKITPRO/portlibs/3ds/lib/pkgconfig"
+ fi
+ if test -z "$PKG_CONFIG_PATH"; then
+ PKG_CONFIG_PATH="$DEVKITPRO/portlibs/3ds/lib/pkgconfig"
+ fi
+ ;;
+
+ds | gamecube | switch | wii)
if test -z "$DEVKITPRO"; then
echo "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to devkitPRO>"
exit 1
Commit: e34c41eaaaeeb0d087ebd37806750cff387182d9
https://github.com/scummvm/scummvm/commit/e34c41eaaaeeb0d087ebd37806750cff387182d9
Author: Vladimir Serbinenko (phcoder at gmail.com)
Date: 2022-12-14T12:17:39+01:00
Commit Message:
3DS: Add explicit path to picasso, bin2s and co
This avoid the need to add them to $PATH explicitly
Changed paths:
backends/platform/3ds/3ds.mk
diff --git a/backends/platform/3ds/3ds.mk b/backends/platform/3ds/3ds.mk
index 0876552fea1..55d2b33122d 100644
--- a/backends/platform/3ds/3ds.mk
+++ b/backends/platform/3ds/3ds.mk
@@ -45,11 +45,11 @@ ifeq ($(DYNAMIC_MODULES),1)
endif
$(TARGET).smdh: $(APP_ICON)
- @smdhtool --create "$(APP_TITLE)" "$(APP_DESCRIPTION)" "$(APP_AUTHOR)" $(APP_ICON) $@
+ @$(DEVKITPRO)/tools/bin/smdhtool --create "$(APP_TITLE)" "$(APP_DESCRIPTION)" "$(APP_AUTHOR)" $(APP_ICON) $@
@echo built ... $(notdir $@)
$(TARGET).3dsx: $(EXECUTABLE) $(TARGET).smdh romfs
- @3dsxtool $< $@ --smdh=$(TARGET).smdh --romfs=romfs
+ @$(DEVKITPRO)/tools/bin/3dsxtool $< $@ --smdh=$(TARGET).smdh --romfs=romfs
@echo built ... $(notdir $@)
$(TARGET).bnr: $(APP_BANNER_IMAGE) $(APP_BANNER_AUDIO)
@@ -74,8 +74,8 @@ dist_3ds: $(TARGET).cia $(TARGET).3dsx $(DIST_FILES_DOCS)
define shader-as
$(eval FILEPATH := $(patsubst %.shbin.o,%.shbin,$@))
$(eval FILE := $(patsubst %.shbin.o,%.shbin,$(notdir $@)))
- picasso -o $(FILEPATH) $1
- bin2s $(FILEPATH) | $(AS) -o $@
+ $(DEVKITPRO)/tools/bin/picasso -o $(FILEPATH) $1
+ $(DEVKITPRO)/tools/bin/bin2s $(FILEPATH) | $(AS) -o $@
echo "extern const u8" `(echo $(FILE) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"_end[];" > `(echo $(FILEPATH) | tr . _)`.h
echo "extern const u8" `(echo $(FILE) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`"[];" >> `(echo $(FILEPATH) | tr . _)`.h
echo "extern const u32" `(echo $(FILE) | sed -e 's/^\([0-9]\)/_\1/' | tr . _)`_size";" >> `(echo $(FILEPATH) | tr . _)`.h
Commit: 2638e6b2a0fcdba5e358f081571922fdd15cd4af
https://github.com/scummvm/scummvm/commit/2638e6b2a0fcdba5e358f081571922fdd15cd4af
Author: Vladimir Serbinenko (phcoder at gmail.com)
Date: 2022-12-14T12:17:39+01:00
Commit Message:
3DS: Make path to bannertool and makerom configurable.
This allows to set them without adding to path
Changed paths:
backends/platform/3ds/3ds.mk
diff --git a/backends/platform/3ds/3ds.mk b/backends/platform/3ds/3ds.mk
index 55d2b33122d..f4d4293bf2c 100644
--- a/backends/platform/3ds/3ds.mk
+++ b/backends/platform/3ds/3ds.mk
@@ -9,6 +9,9 @@ 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
+BANNERTOOL ?= bannertool
+MAKEROM ?= makerom
+
.PHONY: clean_3ds dist_3ds
clean: clean_3ds
@@ -53,11 +56,11 @@ $(TARGET).3dsx: $(EXECUTABLE) $(TARGET).smdh romfs
@echo built ... $(notdir $@)
$(TARGET).bnr: $(APP_BANNER_IMAGE) $(APP_BANNER_AUDIO)
- @bannertool makebanner -o $@ -i $(APP_BANNER_IMAGE) -a $(APP_BANNER_AUDIO)
+ @$(BANNERTOOL) makebanner -o $@ -i $(APP_BANNER_IMAGE) -a $(APP_BANNER_AUDIO)
@echo built ... $(notdir $@)
$(TARGET).cia: $(EXECUTABLE) $(APP_RSF) $(TARGET).smdh $(TARGET).bnr romfs
- @makerom -f cia -target t -exefslogo -o $@ -elf $(EXECUTABLE) -rsf $(APP_RSF) -banner $(TARGET).bnr -icon $(TARGET).smdh -DAPP_ROMFS=romfs/
+ @$(MAKEROM) -f cia -target t -exefslogo -o $@ -elf $(EXECUTABLE) -rsf $(APP_RSF) -banner $(TARGET).bnr -icon $(TARGET).smdh -DAPP_ROMFS=romfs/
@echo built ... $(notdir $@)
dist_3ds: $(TARGET).cia $(TARGET).3dsx $(DIST_FILES_DOCS)
More information about the Scummvm-git-logs
mailing list