From: Christian Groessler <chris@groessler.org>
Date: Wed, 1 Feb 2017 17:15:05 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master' into creativision
X-Git-Tag: V2.16~43^2~12
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=07f840f11c8a502b85c95d2ef7baa44bd690bd90;p=cc65

Merge remote-tracking branch 'upstream/master' into creativision
---

07f840f11c8a502b85c95d2ef7baa44bd690bd90
diff --cc libsrc/Makefile
index 364b266c8,6b6a8fce8..6b9869681
--- a/libsrc/Makefile
+++ b/libsrc/Makefile
@@@ -18,9 -19,9 +19,10 @@@ TARGETS = apple2    
            apple2enh \
            atari     \
            atarixl   \
+           atari2600 \
            atari5200 \
            atmos     \
 +          creativision \
            $(CBMS)   \
            $(GEOS)   \
            gamate    \
diff --cc src/common/target.c
index cc5d41206,42db5dee3..bf87b17e0
--- a/src/common/target.c
+++ b/src/common/target.c
@@@ -152,9 -153,9 +153,10 @@@ static const TargetEntry TargetMap[] = 
      {   "c128",         TGT_C128        },
      {   "c16",          TGT_C16         },
      {   "c64",          TGT_C64         },
+     {   "c65",          TGT_C65         },
      {   "cbm510",       TGT_CBM510      },
      {   "cbm610",       TGT_CBM610      },
 +    {   "creativision", TGT_CREATIVISION},
      {   "gamate",       TGT_GAMATE      },
      {   "geos",         TGT_GEOS_CBM    },
      {   "geos-apple",   TGT_GEOS_APPLE  },
@@@ -193,21 -194,21 +195,24 @@@ static const TargetProperties PropertyT
      { "cbm610",         CPU_6502,       BINFMT_BINARY,      CTPET   },
      { "osic1p",         CPU_6502,       BINFMT_BINARY,      CTOSI   },
      { "pet",            CPU_6502,       BINFMT_BINARY,      CTPET   },
 -    { "bbc",            CPU_6502,       BINFMT_BINARY,      CTNone  },
      { "apple2",         CPU_6502,       BINFMT_BINARY,      CTNone  },
      { "apple2enh",      CPU_65C02,      BINFMT_BINARY,      CTNone  },
 -    { "geos-cbm",       CPU_6502,       BINFMT_BINARY,      CTNone  },
 +    { "atmos",          CPU_6502,       BINFMT_BINARY,      CTNone  },
 +    { "bbc",            CPU_6502,       BINFMT_BINARY,      CTNone  },
 +    { "creativision",   CPU_6502,       BINFMT_BINARY,      CTNone  },
      { "geos-apple",     CPU_65C02,      BINFMT_BINARY,      CTNone  },
 +    { "geos-cbm",       CPU_6502,       BINFMT_BINARY,      CTNone  },
      { "lunix",          CPU_6502,       BINFMT_O65,         CTNone  },
-     { "lynx",           CPU_65C02,      BINFMT_BINARY,      CTNone  },
+     { "atmos",          CPU_6502,       BINFMT_BINARY,      CTNone  },
      { "nes",            CPU_6502,       BINFMT_BINARY,      CTNone  },
+     { "supervision",    CPU_65SC02,     BINFMT_BINARY,      CTNone  },
+     { "lynx",           CPU_65SC02,     BINFMT_BINARY,      CTNone  },
      { "sim6502",        CPU_6502,       BINFMT_BINARY,      CTNone  },
      { "sim65c02",       CPU_65C02,      BINFMT_BINARY,      CTNone  },
      { "pce",            CPU_HUC6280,    BINFMT_BINARY,      CTNone  },
      { "gamate",         CPU_6502,       BINFMT_BINARY,      CTNone  },
 +    { "supervision",    CPU_65SC02,     BINFMT_BINARY,      CTNone  },
+     { "c65",            CPU_4510,       BINFMT_BINARY,      CTPET   },
  };
  
  /* Target system */
diff --cc src/common/target.h
index c266a4408,a5cb44b98..1e54784b1
--- a/src/common/target.h
+++ b/src/common/target.h
@@@ -80,7 -81,7 +81,8 @@@ typedef enum 
      TGT_SIM65C02,
      TGT_PCENGINE,
      TGT_GAMATE,
 +    TGT_SUPERVISION,
+     TGT_C65,
      TGT_COUNT                   /* Number of target systems */
  } target_t;