Have __PLUS4__ imply __C16__.

diff --git a/include/cbm264.h b/include/cbm264.h
index 9ede10f4776472f4bb36892b1f7b9a2f55210181..ff7468d307253668c329cb3f4b86fc3d5908c9a4 100644 (file)
--- a/include/cbm264.h
+++ b/include/cbm264.h
@@ -39,7 +39,7 @@
 
 
 /* Check for errors */
-#if !defined(__PLUS4__) && !defined(__C16__)
+#if !defined(__C16__)
 #  error This module may only be used when compiling for the Plus/4 or C16!
 #endif
 

diff --git a/libsrc/dbg/dbg.c b/libsrc/dbg/dbg.c
index c0c2da971dffa263fbefe2da037a108fffa5b37c..00ff28722ef0b4cca9079390084fadc6015137fe 100644 (file)
--- a/libsrc/dbg/dbg.c
+++ b/libsrc/dbg/dbg.c
@@ -47,7 +47,7 @@ static char GetKeyUpdate (void);
 
 
 /* Color definitions */
-#if defined(__PLUS4__) || defined(__C16__)
+#if defined(__C16__)
 #  define COLOR_BORDER          (BCOLOR_DARKBLUE | CATTR_LUMA6)
 #  define COLOR_BACKGROUND      COLOR_WHITE
 #  define COLOR_TEXTHIGH        COLOR_BLACK

diff --git a/src/ca65/main.c b/src/ca65/main.c
index c862dcaad1df0c3d5e7de65abe212defcba07b2d..4b2f9d1781a8ac6083b094c347ad4f05d2cb40e2 100644 (file)
--- a/src/ca65/main.c
+++ b/src/ca65/main.c
@@ -230,7 +230,8 @@ static void SetSys (const char* Sys)
             break;
 
         case TGT_PLUS4:
-            CBMSystem ("__PLUS4__");
+            CBMSystem ("__C16__");
+            NewSymbol ("__PLUS4__", 1);
             break;
 
         case TGT_CBM510:

diff --git a/src/cc65/main.c b/src/cc65/main.c
index cadad83d08fb3730a38b45022de867aff937163e..a27822ed8718fe58d700fd7125ae00987bb81b38 100644 (file)
--- a/src/cc65/main.c
+++ b/src/cc65/main.c
@@ -186,7 +186,8 @@ static void SetSys (const char* Sys)
             break;
 
         case TGT_PLUS4:
-            cbmsys ("__PLUS4__");
+            cbmsys ("__C16__");
+            DefineNumericMacro ("__PLUS4__", 1);
             break;
 
         case TGT_CBM510: