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

[cc65] / src / ca65 / main.c

diff --git a/src/ca65/main.c b/src/ca65/main.c
index b25d5ad9f4ad5bcdd9f3a4909ac167941bd08665..3c3daf7f72287f3aa1c5ccdb6ffa87cfccd7992b 100644 (file)
--- a/src/ca65/main.c
+++ b/src/ca65/main.c
@@ -205,6 +205,10 @@ static void SetSys (const char* Sys)
             AbEnd ("Cannot use `module' as a target for the assembler");
             break;
 
+        case TGT_ATARI2600:
+            NewSymbol ("__ATARI2600__", 1);
+            break;
+
         case TGT_ATARI5200:
             NewSymbol ("__ATARI5200__", 1);
             break;
@@ -226,6 +230,10 @@ static void SetSys (const char* Sys)
             CBMSystem ("__C64__");
             break;
 
+        case TGT_C65:
+            CBMSystem ("__C65__");
+            break;
+
         case TGT_VIC20:
             CBMSystem ("__VIC20__");
             break;
@@ -251,6 +259,10 @@ static void SetSys (const char* Sys)
             CBMSystem ("__PET__");
             break;
 
+        case TGT_BBC:
+            NewSymbol ("__BBC__", 1);
+            break;
+
         case TGT_APPLE2:
             NewSymbol ("__APPLE2__", 1);
             break;
@@ -270,14 +282,6 @@ static void SetSys (const char* Sys)
             NewSymbol ("__GEOS_CBM__", 1);
             break;
 
-        case TGT_ATMOS:
-            NewSymbol ("__ATMOS__", 1);
-            break;
-
-        case TGT_BBC:
-            NewSymbol ("__BBC__", 1);
-            break;
-
         case TGT_CREATIVISION:
             NewSymbol ("__CREATIVISION__", 1);
             break;
@@ -287,24 +291,30 @@ static void SetSys (const char* Sys)
             NewSymbol ("__GEOS_APPLE__", 1);
             break;
 
-        case TGT_GEOS_CBM:
-            /* Do not handle as a CBM system */
-            NewSymbol ("__GEOS__", 1);
-            NewSymbol ("__GEOS_CBM__", 1);
-            break;
-
         case TGT_LUNIX:
             NewSymbol ("__LUNIX__", 1);
             break;
 
-        case TGT_LYNX:
-            NewSymbol ("__LYNX__", 1);
-            break;
+        case TGT_ATMOS:
+            NewSymbol ("__ATMOS__", 1);
+            break; 
+
+        case TGT_TELESTRAT:
+             NewSymbol ("__TELESTRAT__", 1);
+             break;
 
         case TGT_NES:
             NewSymbol ("__NES__", 1);
             break;
 
+        case TGT_SUPERVISION:
+            NewSymbol ("__SUPERVISION__", 1);
+            break;
+
+        case TGT_LYNX:
+            NewSymbol ("__LYNX__", 1);
+            break;
+
         case TGT_SIM6502:
             NewSymbol ("__SIM6502__", 1);
             break;
@@ -321,10 +331,6 @@ static void SetSys (const char* Sys)
             NewSymbol ("__PCE__", 1);
             break;
 
-        case TGT_SUPERVISION:
-            NewSymbol ("__SUPERVISION__", 1);
-            break;
-
         default:
             AbEnd ("Invalid target name: `%s'", Sys);
 
@@ -629,7 +635,8 @@ static void OptVersion (const char* Opt attribute ((unused)),
                         const char* Arg attribute ((unused)))
 /* Print the assembler version */
 {
-    fprintf (stderr, "ca65 V%s\n", GetVersionAsString ());
+    fprintf (stderr, "%s V%s\n", ProgName, GetVersionAsString ());
+    exit(EXIT_SUCCESS);
 }