diff options
| author | Dirk | 2011-07-11 17:34:14 +0200 |
|---|---|---|
| committer | Dirk | 2011-07-11 17:34:14 +0200 |
| commit | 1dfa24ddb57ef1d42f04e7c00861a85ef27c1c97 (patch) | |
| tree | 1269a025e5822e2340e3ba1f6870a1fb7e17b5d3 /src/os-plugins/plugins/emufe | |
| parent | ipxe stuff 2 (diff) | |
| download | core-1dfa24ddb57ef1d42f04e7c00861a85ef27c1c97.tar.gz core-1dfa24ddb57ef1d42f04e7c00861a85ef27c1c97.tar.xz core-1dfa24ddb57ef1d42f04e7c00861a85ef27c1c97.zip | |
Changes for emulation stuff ...
Diffstat (limited to 'src/os-plugins/plugins/emufe')
| -rw-r--r-- | src/os-plugins/plugins/emufe/files/run-virt.include | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/src/os-plugins/plugins/emufe/files/run-virt.include b/src/os-plugins/plugins/emufe/files/run-virt.include index c7e8ab03..ad0c8845 100644 --- a/src/os-plugins/plugins/emufe/files/run-virt.include +++ b/src/os-plugins/plugins/emufe/files/run-virt.include @@ -77,9 +77,14 @@ case "${emulator}" in cp ${diskfile} ${TMPDIR} # add cdrom if detected --cdrom /dev/srN # --screen win/1024/768 / dga/${xres}/${yres} + # if duplicated options the last one wins - user defined options should over- + # rule system options set here + USERCMDOPTS="$(echo "${emulator}" | tr "A-Z" "a-z")" + USERCMDOPTS="${USERCMDOPTS#*sheepshaver}" VIRTCMDOPTS="${VIRTCMDOPTS} ${rom} --ramsize 128800000 --extfs ${HOME}" - VIRTCMDOPTS="${VIRTCMDOPTS} --ignoresegv true --ignoreillegal true" - VIRTCMDOPTS="${VIRTCMDOPTS} --gfxaccel true --disk ${TMPDIR}/${imgname}" + VIRTCMDOPTS="${VIRTCMDOPTS} --ignoresegv true --ignoreillegal true --gfxaccel true" + VIRTCMDOPTS="${VIRTCMDOPTS} --disk ${TMPDIR}/${imgname} ${USERCMDOPTS}" + VIRTCMD="SheepShaver" ;; basilisk*|Basilisk*) if [ "x${rombios}" != "x" ] ; then @@ -89,11 +94,26 @@ case "${emulator}" in fi rm ~/.basilisk* cp ${diskfile} ${TMPDIR} + # check ordering of duplicated options (user defined options should over- + # rule system options set here + USERCMDOPTS="$(echo "${emulator}" | tr "A-Z" "a-z")" + USERCMDOPTS="${USERCMDOPTS#*basiliskii}" VIRTCMDOPTS="${VIRTCMDOPTS} ${rom} --ramsize 16800000 --extfs ${HOME}" VIRTCMDOPTS="${VIRTCMDOPTS} --ignoresegv true --disk ${TMPDIR}/${imgname}" + VIRTCMDOPTS="${VIRTCMDOPTS} ${USERCMDOPTS}" + VIRTCMD="BasiliskII" ;; hatari*|Hatari*) - + if [ "x${rombios}" != "x" ] ; then + rom="--tos ${imgpath}/${rombios}" + else + echo "problem" + fi + USERCMDOPTS="$(echo "${emulator}" | tr "A-Z" "a-z")" + USERCMDOPTS="${USERCMDOPTS#*hatari}" + VIRTCMDOPTS="${VIRTCMDOPTS} ${rom} --memsize 14 --confirm-quite false" + VIRTCMDOPTS="${VIRTCMDOPTS} -d ${HOME} ${USERCMDOPTS}" + VIRTCMD="hatari" ;; *mess*) [ "x${rombios}" != "x" ] && rom="${imgpath}/${rombios}" |