Merge with current version

src/ca65/main.c

@@ -222,6 +222,10 @@ static void SetSys (const char* Sys)
             CBMSystem ("__C16__");
             break;
 
+		case TGT_C65:
+			CBMSystem("__C65__");
+			break;
+
         case TGT_C64:
             CBMSystem ("__C64__");
             break;
@@ -623,11 +627,12 @@ static void OptVerbose (const char* Opt attribute ((unused)),
 
 
 
-static void OptVersion (const char* Opt attribute ((unused)),
-                        const char* Arg attribute ((unused)))
-/* Print the assembler version */
+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);
 }
 
 

src/cc65/main.c

@@ -746,12 +746,13 @@ static void OptVerbose (const char* Opt attribute ((unused)),
 
 
 
-static void OptVersion (const char* Opt attribute ((unused)),
-                        const char* Arg attribute ((unused)))
-/* Print the compiler version */
+
+static void OptVersion(const char* Opt attribute((unused)),
+	const char* Arg attribute((unused)))
+	/* Print the compiler version */
 {
-    fprintf (stderr, "cc65 V%s\n", GetVersionAsString ());
-    exit (EXIT_SUCCESS);
+	fprintf(stderr, "%s V%s\n", ProgName, GetVersionAsString());
+	exit(EXIT_SUCCESS);
 }
 
 

src/common/target.c

@@ -209,6 +209,8 @@ static const TargetProperties PropertyTable[TGT_COUNT] = {
     { "sim65c02",       CPU_65C02,      BINFMT_BINARY,      CTNone  },
     { "pce",            CPU_HUC6280,    BINFMT_BINARY,      CTNone  },
     { "gamate",         CPU_6502,       BINFMT_BINARY,      CTNone  },
+	{ "c65",            CPU_4510,       BINFMT_BINARY,      CTPET   },
+
 };
 
 /* Target system */

src/common/target.h

@@ -82,6 +82,7 @@ typedef enum {
     TGT_SIM65C02,
     TGT_PCENGINE,
     TGT_GAMATE,
+	TGT_C65,
     TGT_COUNT                   /* Number of target systems */
 } target_t;