[Scummvm-git-logs] scummvm master -> c5cbe71eae488d8f386eee27dec0a1f49156c7af

ccawley2011 ccawley2011 at gmail.com
Sun Aug 9 14:53:05 UTC 2020 

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

Summary:
c5cbe71eae DS: Fix the logo


Commit: c5cbe71eae488d8f386eee27dec0a1f49156c7af
    https://github.com/scummvm/scummvm/commit/c5cbe71eae488d8f386eee27dec0a1f49156c7af
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2020-08-09T15:52:22+01:00

Commit Message:
DS: Fix the logo

The logo needs to be 4bpp, with the first palette entry being transparent.

Changed paths:
  R backends/platform/ds/logoa.bmp
  R backends/platform/ds/logob.bmp
  R backends/platform/ds/logoc.bmp
  R backends/platform/ds/logod.bmp
  R backends/platform/ds/logoe.bmp
  R backends/platform/ds/logof.bmp
  R backends/platform/ds/logog.bmp
  R backends/platform/ds/logoh.bmp
  R backends/platform/ds/logoi.bmp
  R backends/platform/ds/logoj.bmp
  R backends/platform/ds/logok.bmp
    backends/platform/ds/arm9/makefile
    backends/platform/ds/ds.mk
    backends/platform/ds/logo.bmp
    backends/platform/ds/setup-builddirs.sh


diff --git a/backends/platform/ds/arm9/makefile b/backends/platform/ds/arm9/makefile
index 1b21b41a9b..88af796607 100644
--- a/backends/platform/ds/arm9/makefile
+++ b/backends/platform/ds/arm9/makefile
@@ -115,7 +115,6 @@ USE_ARM_COSTUME_ASM = 1
 
 ifdef DS_BUILD_A
 	DEFINES = -DDS_BUILD_A -DUSE_ARM_GFX_ASM -DUSE_ARM_COSTUME_ASM
-	LOGO = logoa.bmp
 	ENABLE_SCUMM = STATIC_PLUGIN
 	USE_ARM_GFX_ASM = 1
 	BUILD=scummvm-A
@@ -123,7 +122,6 @@ endif
 
 ifdef DS_BUILD_B
 	DEFINES = -DDS_BUILD_B
-	LOGO = logob.bmp
 	ENABLE_SKY = STATIC_PLUGIN
 	ENABLE_QUEEN = STATIC_PLUGIN
 	BUILD=scummvm-B
@@ -131,14 +129,12 @@ endif
 
 ifdef DS_BUILD_C
 	DEFINES = -DDS_BUILD_C
-	LOGO = logoc.bmp
 	ENABLE_AGOS = STATIC_PLUGIN
 	BUILD=scummvm-C
 endif
 
 ifdef DS_BUILD_D
 	DEFINES = -DDS_BUILD_D
-	LOGO = logod.bmp
 	ENABLE_GOB = STATIC_PLUGIN
 	ENABLE_CINE = STATIC_PLUGIN
 	ENABLE_AGI = STATIC_PLUGIN
@@ -147,42 +143,36 @@ endif
 
 ifdef DS_BUILD_E
 	DEFINES = -DDS_BUILD_E
-	LOGO = logoe.bmp
 	ENABLE_SAGA = STATIC_PLUGIN
 	BUILD=scummvm-E
 endif
 
 ifdef DS_BUILD_F
 	DEFINES = -DDS_BUILD_F
-	LOGO = logof.bmp
 	ENABLE_KYRA = STATIC_PLUGIN
 	BUILD=scummvm-F
 endif
 
 ifdef DS_BUILD_G
 	DEFINES = -DDS_BUILD_G
-	LOGO = logog.bmp
 	ENABLE_LURE = STATIC_PLUGIN
 	BUILD=scummvm-G
 endif
 
 ifdef DS_BUILD_H
 	DEFINES = -DDS_BUILD_H
-	LOGO = logoh.bmp
 	ENABLE_PARALLACTION = STATIC_PLUGIN
 	BUILD=scummvm-H
 endif
 
 ifdef DS_BUILD_I
 	DEFINES = -DDS_BUILD_I
-	LOGO = logoi.bmp
 	ENABLE_MADE = STATIC_PLUGIN
 	BUILD=scummvm-I
 endif
 
 ifdef DS_BUILD_K
 	DEFINES = -DDS_BUILD_K
-	LOGO = logok.bmp
 	ENABLE_CRUISE = STATIC_PLUGIN
 	BUILD=scummvm-K
 endif
@@ -190,14 +180,12 @@ endif
 
 #ifdef DS_BUILD_L
 #	DEFINES = -DDS_BUILD_L
-#	LOGO = logog.bmp
 #	ENABLE_DRASCULA = STATIC_PLUGIN
 #	BUILD=scummvm-K
 #endif
 
 #ifdef DS_BUILD_M
 #	DEFINES = -DDS_BUILD_M
-#	LOGO = logog.bmp
 #	ENABLE_TUCKER = STATIC_PLUGIN
 #	BUILD=scummvm-K
 #endif
@@ -406,7 +394,7 @@ endef
 
 #---------------------------------------------------------------------------------
 %.nds: %.bin
-	ndstool -c $@ -9 $< $(ARM7BIN) -b ../../$(LOGO) "$(@F);ScummVM $(VERSION);DS Port"
+	ndstool -c $@ -9 $< $(ARM7BIN) -b ../../logo.bmp "$(@F);ScummVM $(VERSION);DS Port"
 
 %.ds.gba: %.nds
 	dsbuild $< -o $@ -l $(portdir)/ndsloader.bin
diff --git a/backends/platform/ds/ds.mk b/backends/platform/ds/ds.mk
index 83cf8d8213..8b104f624b 100644
--- a/backends/platform/ds/ds.mk
+++ b/backends/platform/ds/ds.mk
@@ -24,8 +24,6 @@
 #   DEFAULT_CONFIG_FILE).
 #   There are a few game specific hacks which are currently controlled by this,
 #   too; we need to investigate those.
-# * It does not currently adjust the logo. Ideally, if we ever get real plugin
-#   support, that should be necessary anymore anyway.
 # * No support for USE_DEBUGGER and USE_PROFILER yet. I envision that we would
 #  integrate them with the --enable-debug and --enable-profiling configure options,
 #  I simply haven't gotten around to do that yet.
@@ -34,10 +32,6 @@
 # Set location of ndsdir so that we can easily refer to files in it
 ndsdir = backends/platform/ds
 
-
-# Until we fix logo support, always use the A logo
-LOGO = logoa.bmp
-
 # Uncomment the following line to enable support for the
 # ace DS Debugger (remembering to make the same change in the arm7 makefile):
 #USE_DEBUGGER = 1
@@ -147,7 +141,7 @@ dsclean:
 # TODO: Add a 'dsdist' target ?
 
 %.nds: %.elf $(ndsdir)/arm7/arm7.elf
-	ndstool -c $@ -9 $< -7 $(ndsdir)/arm7/arm7.elf -b $(srcdir)/$(ndsdir)/$(LOGO) "$(@F);ScummVM $(VERSION);DS Port"
+	ndstool -c $@ -9 $< -7 $(ndsdir)/arm7/arm7.elf -b $(srcdir)/$(ndsdir)/logo.bmp "$(@F);ScummVM $(VERSION);DS Port"
 
 %.ds.gba: %.nds
 	dsbuild $< -o $@ -l $(srcdir)/$(ndsdir)/arm9/ndsloader.bin
diff --git a/backends/platform/ds/logo.bmp b/backends/platform/ds/logo.bmp
index 333a68ebe2..68405b759a 100644
Binary files a/backends/platform/ds/logo.bmp and b/backends/platform/ds/logo.bmp differ
diff --git a/backends/platform/ds/logoa.bmp b/backends/platform/ds/logoa.bmp
deleted file mode 100644
index 63a69d9231..0000000000
Binary files a/backends/platform/ds/logoa.bmp and /dev/null differ
diff --git a/backends/platform/ds/logob.bmp b/backends/platform/ds/logob.bmp
deleted file mode 100644
index 2e536ecb6e..0000000000
Binary files a/backends/platform/ds/logob.bmp and /dev/null differ
diff --git a/backends/platform/ds/logoc.bmp b/backends/platform/ds/logoc.bmp
deleted file mode 100644
index 2072a6ea02..0000000000
Binary files a/backends/platform/ds/logoc.bmp and /dev/null differ
diff --git a/backends/platform/ds/logod.bmp b/backends/platform/ds/logod.bmp
deleted file mode 100644
index 05da13223e..0000000000
Binary files a/backends/platform/ds/logod.bmp and /dev/null differ
diff --git a/backends/platform/ds/logoe.bmp b/backends/platform/ds/logoe.bmp
deleted file mode 100644
index db7437b299..0000000000
Binary files a/backends/platform/ds/logoe.bmp and /dev/null differ
diff --git a/backends/platform/ds/logof.bmp b/backends/platform/ds/logof.bmp
deleted file mode 100644
index 71d4d5ce42..0000000000
Binary files a/backends/platform/ds/logof.bmp and /dev/null differ
diff --git a/backends/platform/ds/logog.bmp b/backends/platform/ds/logog.bmp
deleted file mode 100644
index e0040d8f33..0000000000
Binary files a/backends/platform/ds/logog.bmp and /dev/null differ
diff --git a/backends/platform/ds/logoh.bmp b/backends/platform/ds/logoh.bmp
deleted file mode 100644
index 40f20cbf23..0000000000
Binary files a/backends/platform/ds/logoh.bmp and /dev/null differ
diff --git a/backends/platform/ds/logoi.bmp b/backends/platform/ds/logoi.bmp
deleted file mode 100644
index a60d6eff52..0000000000
Binary files a/backends/platform/ds/logoi.bmp and /dev/null differ
diff --git a/backends/platform/ds/logoj.bmp b/backends/platform/ds/logoj.bmp
deleted file mode 100644
index ca22f95c5a..0000000000
Binary files a/backends/platform/ds/logoj.bmp and /dev/null differ
diff --git a/backends/platform/ds/logok.bmp b/backends/platform/ds/logok.bmp
deleted file mode 100644
index 584ed2d068..0000000000
Binary files a/backends/platform/ds/logok.bmp and /dev/null differ
diff --git a/backends/platform/ds/setup-builddirs.sh b/backends/platform/ds/setup-builddirs.sh
index 11aacc1233..f83876e8d1 100755
--- a/backends/platform/ds/setup-builddirs.sh
+++ b/backends/platform/ds/setup-builddirs.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 
 # TODO: Allow specifying (a list of) build ids (a, b, ...) on the command line.
-# TODO: Allow overriding the LOGO variable
 
 # TODO: Computer srcdir in a better way
 srcdir=../../../`dirname $0`/..

More information about the Scummvm-git-logs mailing list