OPENDINGUX: Create combined opk for rs90 and rg99

backends/platform/sdl/opendingux/build_odbeta.sh

@@ -21,13 +21,14 @@ case $target in
 	libc=musl
         ;;
 
-        rg99)
+        rg99 | rs90)
 	target2=rs90
+        target=rg99
 	libc=musl
         ;;
-        
+
         *)
-        echo "please provide a valid target for the build: gcw0, lepus or rg99"
+        echo "please provide a valid target for the build: gcw0, lepus, rg99 or rs90"
         exit 1
         ;;
 esac

backends/platform/sdl/opendingux/opendingux.mk

@@ -1,5 +1,10 @@
 OD_EXE_STRIPPED := scummvm_stripped$(EXEEXT)
 bundle = od-opk
+ifeq ($(OPENDINGUX_TARGET), rg99)
+OPKNAME = rg99_rs90
+else
+OPKNAME = $(OPENDINGUX_TARGET)
+endif
 
 all: $(OD_EXE_STRIPPED)
 
@@ -40,6 +45,13 @@ ifdef dualopk
 	$(CP) $(srcdir)/dists/opendingux/startGame.$(OPENDINGUX_TARGET).desktop $(bundle)/
 	$(CP) $(srcdir)/dists/opendingux/scummvm.sh $(bundle)/
 endif
+ifeq ($(OPENDINGUX_TARGET), rg99)
+	$(CP) $(srcdir)/dists/opendingux/startUI.rs90.desktop $(bundle)/
+ifdef dualopk
+	$(CP) $(srcdir)/dists/opendingux/startGame.rs90.desktop $(bundle)/
+endif
+endif
+
 	$(CP) $(srcdir)/backends/platform/sdl/opendingux/README.OPENDINGUX $(bundle)/README.man.txt
 	echo >> $(bundle)/README.man.txt
 	echo '[General README]' >> $(bundle)/README.man.txt
@@ -50,7 +62,7 @@ od-make-opk: $(bundle)
 	$(STRIP) $(bundle)/scummvm
 
 ifdef dualopk
-	$(srcdir)/dists/opendingux/make-opk.sh -d $(bundle) -o scummvm_$(OPENDINGUX_TARGET)_dual
+	$(srcdir)/dists/opendingux/make-opk.sh -d $(bundle) -o scummvm_$(OPKNAME)_dual
 else
-	$(srcdir)/dists/opendingux/make-opk.sh -d $(bundle) -o scummvm_$(OPENDINGUX_TARGET)
+	$(srcdir)/dists/opendingux/make-opk.sh -d $(bundle) -o scummvm_$(OPKNAME)
 endif

configure

@@ -839,7 +839,8 @@ Special configuration feature:
                                            n64 for Nintendo 64
                                            opendingux-gcw0 for GCW0 with Opendingux Beta
                                            opendingux-lepus for Lepus with Opendingux Beta
-                                           opendingux-rg99 for RG99 with Opendingux Beta
+                                           opendingux-rg99 for RG99 and RS90 with Opendingux Beta
+                                           opendingux-rs90 for RG99 and RS90 with Opendingux Beta
                                            openpandora for OpenPandora
                                            ouya for OUYA
                                            ps3 for PlayStation 3
@@ -3581,11 +3582,12 @@ if test -n "$_host"; then
 					_highres=no
 					_build_hq_scalers=no
 					;;
-				opendingux-rg99)
+				opendingux-rg99 | opendingux-rs90)
 					append_var DEFINES "-DRS90 -DDISABLE_FANCY_THEMES"
 					_16bit=no
 					_highres=no
 					_build_hq_scalers=no
+					_host=opendingux-rg99
 					;;
 				*)
 					echo "WARNING: Unknown OpenDingux target"

dists/opendingux/startGame.rs90.desktop

@@ -0,0 +1,16 @@
+[Desktop Entry]
+Name=ScummVM
+Comment=Interpreter for several adventure games
+Comment[pl]=Interpreter graficznych gier przygodowych
+Comment[sv]=Tolk för flera äventyrsspel
+Comment[he]=פרשן למספר משחקי הרפתקאות
+Comment[de]=Interpreter für diverse Abenteuerspiele
+Comment[es]=Intérprete para varias aventuras gráficas
+Comment[ca]=Intèrpret per diverses aventures gràfiques
+Exec=env SDL_VIDEO_KMSDRM_SCALING_MODE=1 ./scummvm.sh %f
+Icon=scummvm
+Terminal=false
+Type=Application
+Categories=games;
+StartupNotify=false
+X-OD-Manual=README.man.txt

dists/opendingux/startUI.rs90.desktop

@@ -0,0 +1,16 @@
+[Desktop Entry]
+Name=ScummVM UI
+Comment=Interpreter for several adventure games
+Comment[pl]=Interpreter graficznych gier przygodowych
+Comment[sv]=Tolk för flera äventyrsspel
+Comment[he]=פרשן למספר משחקי הרפתקאות
+Comment[de]=Interpreter für diverse Abenteuerspiele
+Comment[es]=Intérprete para varias aventuras gráficas
+Comment[ca]=Intèrpret per diverses aventures gràfiques
+Exec=env SDL_VIDEO_KMSDRM_SCALING_MODE=1 ./scummvm
+Icon=scummvm
+Terminal=false
+Type=Application
+Categories=games;
+StartupNotify=false
+X-OD-Manual=README.man.txt