From 6632756ceba944c3c242ecbe479d2e3abf4b2cd1 Mon Sep 17 00:00:00 2001 From: cuz Date: Thu, 30 Nov 2000 08:55:16 +0000 Subject: [PATCH] Replaced the unused NES target by BBC git-svn-id: svn://svn.cc65.org/cc65/trunk@497 b7a2c559-68d2-44c3-8de9-860c34a00d81 --- src/cc65/main.c | 4 ++-- src/common/target.c | 2 +- src/common/target.h | 2 +- src/common/tgttrans.c | 2 +- src/ld65/.cvsignore | 1 + src/ld65/make/gcc.mak | 4 ++++ src/ld65/tgtcfg.c | 13 +++++++------ 7 files changed, 17 insertions(+), 11 deletions(-) diff --git a/src/cc65/main.c b/src/cc65/main.c index 7d68817f9..a73622c25 100644 --- 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 3a5fc2171..a5f31654d 100644 --- 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 02080ab51..33ef51f14 100644 --- 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 022dafede..39e48f204 100644 --- 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 f0c6de94c..1d5a66f12 100644 --- 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 1b4affcc8..d87c2359b 100644 --- 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 7844c4b24..46d5ee172 100644 --- 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 }, }; - + -- 2.39.5