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

[cc65] / src / ca65 / main.c

diff --git a/src/ca65/main.c b/src/ca65/main.c
index 3f31a2b88d203f2a0acb0422b139f3080c4bb5a8..1da0ff36d717ff3ff1f376b3c4f62c8a1879d715 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,10 +259,6 @@ static void SetSys (const char* Sys)
             CBMSystem ("__PET__");
             break;
 
-        case TGT_BBC:
-            NewSymbol ("__BBC__", 1);
-            break;
-
         case TGT_APPLE2:
             NewSymbol ("__APPLE2__", 1);
             break;
@@ -264,12 +268,28 @@ static void SetSys (const char* Sys)
             NewSymbol ("__APPLE2ENH__", 1);
             break;
 
+        case TGT_GAMATE:
+            NewSymbol ("__GAMATE__", 1);
+            break;
+
         case TGT_GEOS_CBM:
             /* Do not handle as a CBM system */
             NewSymbol ("__GEOS__", 1);
             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;
+
         case TGT_GEOS_APPLE:
             NewSymbol ("__GEOS__", 1);
             NewSymbol ("__GEOS_APPLE__", 1);
@@ -279,22 +299,14 @@ static void SetSys (const char* Sys)
             NewSymbol ("__LUNIX__", 1);
             break;
 
-        case TGT_ATMOS:
-            NewSymbol ("__ATMOS__", 1);
+        case TGT_LYNX:
+            NewSymbol ("__LYNX__", 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;
@@ -303,6 +315,18 @@ static void SetSys (const char* Sys)
             NewSymbol ("__SIM65C02__", 1);
             break;
 
+        case TGT_OSIC1P:
+            NewSymbol ("__OSIC1P__", 1);
+            break;
+
+        case TGT_PCENGINE:
+            NewSymbol ("__PCE__", 1);
+            break;
+
+        case TGT_SUPERVISION:
+            NewSymbol ("__SUPERVISION__", 1);
+            break;
+
         default:
             AbEnd ("Invalid target name: `%s'", Sys);
 
@@ -607,7 +631,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);
 }