[Scummvm-git-logs] scummvm branch-2-3 -> 01a94b906e00182597d95b6b513d7c52492972fe

[ccawley2011]

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

Summary:
ff40dfe91f RISCOS: Fix detecting packages using pkg-config
01a94b906e RISCOS: More packaging improvements


Commit: ff40dfe91f9d3e6450e078e2a1b226b01381ca17
    https://github.com/scummvm/scummvm/commit/ff40dfe91f9d3e6450e078e2a1b226b01381ca17
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2021-09-30T22:56:39+01:00

Commit Message:
RISCOS: Fix detecting packages using pkg-config

Changed paths:
    configure


diff --git a/configure b/configure
index 2312e063dd..0951e9abaa 100755
--- a/configure
+++ b/configure
@@ -3206,6 +3206,9 @@ if test -n "$_host"; then
 			_optimization_level=-O1
 			append_var LDFLAGS "-L$GCCSDK_INSTALL_ENV/vfp/lib"
 			append_var CXXFLAGS "-isystem $GCCSDK_INSTALL_ENV/vfp/include"
+			if test -z "$PKG_CONFIG_LIBDIR"; then
+				PKG_CONFIG_LIBDIR="$GCCSDK_INSTALL_ENV/vfp/lib/pkgconfig"
+			fi
 			_sdlpath=$GCCSDK_INSTALL_ENV/vfp/bin
 			_freetypepath=$GCCSDK_INSTALL_ENV/vfp/bin
 			_libcurlpath=$GCCSDK_INSTALL_ENV/vfp/bin
@@ -3218,7 +3221,9 @@ if test -n "$_host"; then
 		arm-*riscos)
 			append_var LDFLAGS "-L$GCCSDK_INSTALL_ENV/lib"
 			append_var CXXFLAGS "-isystem $GCCSDK_INSTALL_ENV/include"
-			_pkgconfig=$GCCSDK_INSTALL_ENV/ro-pkg-config
+			if test -z "$PKG_CONFIG_LIBDIR"; then
+				PKG_CONFIG_LIBDIR="$GCCSDK_INSTALL_ENV/lib/pkgconfig"
+			fi
 			_sdlpath=$GCCSDK_INSTALL_ENV/bin
 			_freetypepath=$GCCSDK_INSTALL_ENV/bin
 			_libcurlpath=$GCCSDK_INSTALL_ENV/bin


Commit: 01a94b906e00182597d95b6b513d7c52492972fe
    https://github.com/scummvm/scummvm/commit/01a94b906e00182597d95b6b513d7c52492972fe
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2021-09-30T23:00:23+01:00

Commit Message:
RISCOS: More packaging improvements

Changed paths:
  A dists/riscos/!ScummVM2/!Boot,feb
    backends/platform/sdl/riscos/riscos.mk


diff --git a/backends/platform/sdl/riscos/riscos.mk b/backends/platform/sdl/riscos/riscos.mk
index 281abbaa7d..155ef488e7 100644
--- a/backends/platform/sdl/riscos/riscos.mk
+++ b/backends/platform/sdl/riscos/riscos.mk
@@ -20,7 +20,7 @@ ifeq ($(APP_NAME),$(BASE_APP_NAME))
 	cp ${srcdir}/dists/riscos/!Sprites,ff9 $(APP_NAME)/!Sprites,ff9
 	cp ${srcdir}/dists/riscos/!Sprites11,ff9 $(APP_NAME)/!Sprites11,ff9
 else
-	echo 'IconSprites <Obey$$Dir>.!Sprites' > $(APP_NAME)/!Boot,feb
+	cp ${srcdir}/dists/riscos/$(APP_NAME)/!Boot,feb $(APP_NAME)/!Boot,feb
 	cp ${srcdir}/dists/riscos/$(APP_NAME)/!Sprites,ff9 $(APP_NAME)/!Sprites,ff9
 	cp ${srcdir}/dists/riscos/$(APP_NAME)/!Sprites11,ff9 $(APP_NAME)/!Sprites11,ff9
 endif
@@ -58,5 +58,6 @@ clean: riscosclean
 
 riscosclean:
 	$(RM_REC) $(APP_NAME)
+	$(RM_REC) $(BASE_APP_NAME)
 
 .PHONY: riscosdist riscosclean
diff --git a/dists/riscos/!ScummVM2/!Boot,feb b/dists/riscos/!ScummVM2/!Boot,feb
new file mode 100644
index 0000000000..155cf75d59
--- /dev/null
+++ b/dists/riscos/!ScummVM2/!Boot,feb
@@ -0,0 +1,2 @@
+Set ScummVM2$Dir <Obey$Dir>
+IconSprites <ScummVM2$Dir>.!Sprites