emulation/vice/vice-2.4-aros.diff

   1 diff -Naur vice-2.4-orig/configure vice-2.4/configure
   2 --- vice-2.4-orig/configure     2013-09-08 17:09:30.327048804 +0200
   3 +++ vice-2.4/configure  2013-09-08 17:11:37.183054944 +0200
   4 @@ -3308,9 +3308,6 @@
   5        done
   6        ;;
   7    esac
   8 -  if test x"$argvalid" = "xno"; then
   9 -    as_fn_error $? "invalid option: $argcheck" "$LINENO" 5
  10 -  fi
  11  done
  12
  13
  14 diff -Naur vice-2.4-orig/src/arch/amigaos/console.c vice-2.4/src/arch/amigaos/console.c
  15 --- vice-2.4-orig/src/arch/amigaos/console.c    2013-09-08 17:09:30.359048806 +0200
  16 +++ vice-2.4/src/arch/amigaos/console.c 2013-09-08 19:00:47.071371936 +0200
  17 @@ -52,7 +52,7 @@
  18  static BPTR console_handle;
  19  static int fullscreenwasenabled=0;
  20
  21 -#ifdef AMIGA_MORPHOS
  22 +#if defined(AMIGA_MORPHOS) || defined(AMIGA_AROS)
  23  static APTR fh_putchproc(APTR putchdata, UBYTE ch)
  24  {
  25      FPutC((BPTR)putchdata, ch);
  26 @@ -65,12 +65,8 @@
  27      va_list ap;
  28
  29      va_start(ap, format);
  30 -#ifndef AMIGA_MORPHOS
  31 -#ifdef AMIGA_AROS
  32 -    VFPrintf(console_handle, format, (IPTR *)ap);
  33 -#else
  34 +#if !defined(AMIGA_MORPHOS) && !defined(AMIGA_AROS)
  35      VFPrintf(console_handle, format, (CONST APTR)ap);
  36 -#endif
  37  #else
  38      VNewRawDoFmt(format, fh_putchproc, (STRPTR)console_handle, ap);
  39  #endif
  40 diff -Naur vice-2.4-orig/src/arch/amigaos/x128ns.c vice-2.4/src/arch/amigaos/x128ns.c
  41 --- vice-2.4-orig/src/arch/amigaos/x128ns.c     2013-09-08 17:09:30.359048806 +0200
  42 +++ vice-2.4/src/arch/amigaos/x128ns.c  2013-09-08 18:35:38.127298911 +0200
  43 @@ -29,5 +29,5 @@
  44
  45  int main(void)
  46  {
  47 -    return system("x128.exe -sounddev dummy");
  48 +    return system("x128 -sounddev dummy");
  49  }
  50 diff -Naur vice-2.4-orig/src/arch/amigaos/x64dtvns.c vice-2.4/src/arch/amigaos/x64dtvns.c
  51 --- vice-2.4-orig/src/arch/amigaos/x64dtvns.c   2013-09-08 17:09:30.359048806 +0200
  52 +++ vice-2.4/src/arch/amigaos/x64dtvns.c        2013-09-08 18:35:45.583299274 +0200
  53 @@ -29,5 +29,5 @@
  54
  55  int main(void)
  56  {
  57 -    return system("x64dtv.exe -sounddev dummy");
  58 +    return system("x64dtv -sounddev dummy");
  59  }
  60 diff -Naur vice-2.4-orig/src/arch/amigaos/x64ns.c vice-2.4/src/arch/amigaos/x64ns.c
  61 --- vice-2.4-orig/src/arch/amigaos/x64ns.c      2013-09-08 17:09:30.359048806 +0200
  62 +++ vice-2.4/src/arch/amigaos/x64ns.c   2013-09-08 18:35:51.887299576 +0200
  63 @@ -29,5 +29,5 @@
  64
  65  int main(void)
  66  {
  67 -    return system("x64.exe -sounddev dummy");
  68 +    return system("x64 -sounddev dummy");
  69  }
  70 diff -Naur vice-2.4-orig/src/arch/amigaos/x64scns.c vice-2.4/src/arch/amigaos/x64scns.c
  71 --- vice-2.4-orig/src/arch/amigaos/x64scns.c    2013-09-08 17:09:30.359048806 +0200
  72 +++ vice-2.4/src/arch/amigaos/x64scns.c 2013-09-08 18:35:57.999299873 +0200
  73 @@ -29,5 +29,5 @@
  74
  75  int main(void)
  76  {
  77 -    return system("x64sc.exe -sounddev dummy");
  78 +    return system("x64sc -sounddev dummy");
  79  }
  80 diff -Naur vice-2.4-orig/src/arch/amigaos/xcbm2ns.c vice-2.4/src/arch/amigaos/xcbm2ns.c
  81 --- vice-2.4-orig/src/arch/amigaos/xcbm2ns.c    2013-09-08 17:09:30.359048806 +0200
  82 +++ vice-2.4/src/arch/amigaos/xcbm2ns.c 2013-09-08 18:36:03.887300158 +0200
  83 @@ -29,5 +29,5 @@
  84
  85  int main(void)
  86  {
  87 -    return system("xcbm2.exe -sounddev dummy");
  88 +    return system("xcbm2 -sounddev dummy");
  89  }
  90 diff -Naur vice-2.4-orig/src/arch/amigaos/xcbm5x0ns.c vice-2.4/src/arch/amigaos/xcbm5x0ns.c
  91 --- vice-2.4-orig/src/arch/amigaos/xcbm5x0ns.c  2013-09-08 17:09:30.359048806 +0200
  92 +++ vice-2.4/src/arch/amigaos/xcbm5x0ns.c       2013-09-08 18:36:09.631300437 +0200
  93 @@ -29,5 +29,5 @@
  94
  95  int main(void)
  96  {
  97 -    return system("xcbm5x0.exe -sounddev dummy");
  98 +    return system("xcbm5x0 -sounddev dummy");
  99  }
 100 diff -Naur vice-2.4-orig/src/arch/amigaos/xpetns.c vice-2.4/src/arch/amigaos/xpetns.c
 101 --- vice-2.4-orig/src/arch/amigaos/xpetns.c     2013-09-08 17:09:30.359048806 +0200
 102 +++ vice-2.4/src/arch/amigaos/xpetns.c  2013-09-08 18:36:15.903300740 +0200
 103 @@ -29,5 +29,5 @@
 104
 105  int main(void)
 106  {
 107 -    return system("xpet.exe -sounddev dummy");
 108 +    return system("xpet -sounddev dummy");
 109  }
 110 diff -Naur vice-2.4-orig/src/arch/amigaos/xplus4ns.c vice-2.4/src/arch/amigaos/xplus4ns.c
 111 --- vice-2.4-orig/src/arch/amigaos/xplus4ns.c   2013-09-08 17:09:30.359048806 +0200
 112 +++ vice-2.4/src/arch/amigaos/xplus4ns.c        2013-09-08 18:36:22.255301047 +0200
 113 @@ -29,5 +29,5 @@
 114
 115  int main(void)
 116  {
 117 -    return system("xplus4.exe -sounddev dummy");
 118 +    return system("xplus4 -sounddev dummy");
 119  }
 120 diff -Naur vice-2.4-orig/src/arch/amigaos/xvicns.c vice-2.4/src/arch/amigaos/xvicns.c
 121 --- vice-2.4-orig/src/arch/amigaos/xvicns.c     2013-09-08 17:09:30.363048806 +0200
 122 +++ vice-2.4/src/arch/amigaos/xvicns.c  2013-09-08 18:36:29.551301400 +0200
 123 @@ -29,5 +29,5 @@
 124
 125  int main(void)
 126  {
 127 -    return system("xvic.exe -sounddev dummy");
 128 +    return system("xvic -sounddev dummy");
 129  }