Replaced the unused NES target by BBC

git-svn-id: svn://svn.cc65.org/cc65/trunk@497 b7a2c559-68d2-44c3-8de9-860c34a00d81

diff --git a/src/cc65/main.c b/src/cc65/main.c
index 7d68817f960f3f36eec05dd26514014072247dc9..a73622c250346e1e23cdf3adeaa3d89d1c3b7517 100644 (file)
--- a/src/cc65/main.c
+++ b/src/cc65/main.c
@@ -159,8 +159,8 @@ static void SetSys (const char* Sys)
            cbmsys ("__PET__");
            break;
 
-       case TGT_NES:
-           AddNumericMacro ("__NES__", 1);
+       case TGT_BBC:
+           AddNumericMacro ("__BBC__", 1);
            break;
 
        case TGT_APPLE2:

diff --git a/src/common/target.c b/src/common/target.c
index 3a5fc217174c5b850cef06564b896a2b0103a8fc..a5f31654d9b5ad2026c0b59aff77909697b9736d 100644 (file)
--- a/src/common/target.c
+++ b/src/common/target.c
@@ -60,7 +60,7 @@ const char* TargetNames [TGT_COUNT] = {
     "plus4",
     "cbm610",
     "pet",
-    "nes",
+    "bbc",
     "apple2",
     "geos",
 };

diff --git a/src/common/target.h b/src/common/target.h
index 02080ab51a5dd07696454ec07651c1dc803eb381..33ef51f14b7492bb195350f6916c52ee7ab67e68 100644 (file)
--- a/src/common/target.h
+++ b/src/common/target.h
@@ -55,7 +55,7 @@ typedef enum {
     TGT_PLUS4,
     TGT_CBM610,
     TGT_PET,
-    TGT_NES,
+    TGT_BBC,
     TGT_APPLE2,
     TGT_GEOS,
     TGT_COUNT                  /* Number of target systems */

diff --git a/src/common/tgttrans.c b/src/common/tgttrans.c
index 022dafedef099515f2ffb5ceae9fc84bcb7062b4..39e48f20425f59f0c1c3e7ee66aca72d8cbea7b8 100644 (file)
--- a/src/common/tgttrans.c
+++ b/src/common/tgttrans.c
@@ -108,7 +108,7 @@ void TgtTranslateInit (void)
        case TGT_PLUS4:         Tab = CTPET;    break;
        case TGT_CBM610:        Tab = CTAtari;  break;
        case TGT_PET:           Tab = CTAtari;  break;
-       case TGT_NES:                           break;
+       case TGT_BBC:                           break;
        case TGT_APPLE2:                        break;
        case TGT_GEOS:                          break;
        default:

diff --git a/src/ld65/.cvsignore b/src/ld65/.cvsignore
index f0c6de94c0e76ed8902ccdf34eb30440216c9d60..1d5a66f12319815f024806c09376a10366146766 100644 (file)
--- a/src/ld65/.cvsignore
+++ b/src/ld65/.cvsignore
@@ -4,6 +4,7 @@ ld65
 *.s
 apple2.inc
 atari.inc
+bbc.inc
 c128.inc
 c64.inc
 cbm610.inc

diff --git a/src/ld65/make/gcc.mak b/src/ld65/make/gcc.mak
index 1b4affcc840b200db559cc7a74769026b1218011..d87c2359b35eee58a02e638167783c4572fcf72a 100644 (file)
--- a/src/ld65/make/gcc.mak
+++ b/src/ld65/make/gcc.mak
@@ -44,6 +44,7 @@ OBJS =        bin.o           \
 
 INCS = apple2.inc      \
        atari.inc       \
+       bbc.inc         \
        c64.inc         \
        c128.inc        \
        cbm610.inc      \
@@ -100,6 +101,9 @@ apple2.inc: cfg/apple2.cfg
 atari.inc:             cfg/atari.cfg
        @$(CVT) $< $@ CfgAtari
 
+bbc.inc:       cfg/bbc.cfg
+       @$(CVT) $< $@ CfgBBC
+
 c64.inc:       cfg/c64.cfg
        @$(CVT) $< $@ CfgC64
 

diff --git a/src/ld65/tgtcfg.c b/src/ld65/tgtcfg.c
index 7844c4b24dd5deccbefc3a5935f5640276743dc4..46d5ee172783dc39121fae8d9772984c769732c5 100644 (file)
--- a/src/ld65/tgtcfg.c
+++ b/src/ld65/tgtcfg.c
@@ -43,13 +43,14 @@
 /*****************************************************************************/
 
 
-                                 
+
 /* An empty config */
 static const char CfgEmpty[] = "";
-                    
+
 /* Actual target configurations, converted into C strings by a perl script */
 #include "apple2.inc"
 #include "atari.inc"
+#include "bbc.inc"
 #include "c128.inc"
 #include "c64.inc"
 #include "cbm610.inc"
@@ -57,7 +58,7 @@ static const char CfgEmpty[] = "";
 #include "none.inc"
 #include "pet.inc"
 #include "plus4.inc"
-
+                 
 
 
 /*****************************************************************************/
@@ -72,15 +73,15 @@ const TargetDesc Targets [TGT_COUNT] = {
     {          BINFMT_BINARY,  CfgAtari        },
     {          BINFMT_BINARY,  CfgC64          },
     {          BINFMT_BINARY,  CfgC128         },
-    {          BINFMT_BINARY,  CfgEmpty        },      /* Ace */
+    {          BINFMT_BINARY,  CfgEmpty        },      /* Ace */
     {          BINFMT_BINARY,  CfgPlus4        },
     {          BINFMT_BINARY,  CfgCBM610       },
     {          BINFMT_BINARY,  CfgPET          },
-    {          BINFMT_BINARY,  CfgEmpty        },      /* NES */
+    {          BINFMT_BINARY,  CfgBBC          },
     {   BINFMT_BINARY, CfgApple2       },
     {   BINFMT_BINARY,  CfgGeos                },
 };
 
 
 
-                                         
+