[Scummvm-git-logs] scummvm master -> 6dfa49ba485a36fee7d569e9c9e16210222156c3

[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:
6c5a2bf1d8 RISCOS: Fix detecting packages using pkg-config
6dfa49ba48 RISCOS: More packaging improvements


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

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

Changed paths:
    configure


diff --git a/configure b/configure
index 2cf168797e..18cf1c90d4 100755
--- a/configure
+++ b/configure
@@ -3208,6 +3208,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
@@ -3220,7 +3223,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: 6dfa49ba485a36fee7d569e9c9e16210222156c3
    https://github.com/scummvm/scummvm/commit/6dfa49ba485a36fee7d569e9c9e16210222156c3
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2021-09-30T23:01:53+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