shithub: rgbds

Download patch

ref: 0d07caba60b5d082a22cbbb4eb78cfefabb0ea64
parent: 3992ce2502e46caf0105d093ee8f65651b2c6650
author: Anthony J. Bentley <[email protected]>
date: Thu Sep 25 16:56:15 EDT 2014

Remove inconsistent version numbering.

--- a/include/asm/asm.h
+++ b/include/asm/asm.h
@@ -17,8 +17,6 @@
 
 #include "localasm.h"
 
-#include "asmotor.h"
-
 extern SLONG nLineNo;
 extern ULONG nTotalLines;
 extern ULONG nPC;
--- a/include/asmotor.h
+++ /dev/null
@@ -1,21 +1,0 @@
-/*	asmotor.h
- *
- *	Contains defines for every program in the ASMotor package
- *
- *	Copyright 1997 Carsten Sorensen
- *
- */
-
-#ifndef	ASMOTOR_ASMOTOR_H
-#define	ASMOTOR_ASMOTOR_H
-
-#define	ASMOTOR
-
-#define	ASMOTOR_VERSION	"1.10-linux"
-
-#define	ASM_VERSION		"1.08c"
-#define	LINK_VERSION	"1.06c"
-#define	RGBFIX_VERSION	"1.02"
-#define	LIB_VERSION		"1.00"
-
-#endif
--- a/src/asm/main.c
+++ b/src/asm/main.c
@@ -242,8 +242,6 @@
 void 
 PrintUsage(void)
 {
-	printf("RGBAsm v" ASM_VERSION " (part of ASMotor " ASMOTOR_VERSION
-	    ")\n\n");
 	printf("Usage: rgbasm [-v] [-h] [-b chars] [-g chars] [-i path] [-o outfile] [-p pad_value]\n"
 	    "              file\n");
 	exit(1);
--- a/src/asm/symbol.c
+++ b/src/asm/symbol.c
@@ -873,7 +873,6 @@
 	p_NARGSymbol = findsymbol("_NARG", NULL);
 	p_NARGSymbol->Callback = Callback_NARG;
 
-	sym_AddEqu("__ASM__", (SLONG) (atof(ASM_VERSION) * 65536));
 	sym_AddSet("_RS", 0);
 
 	if (time(&tod) != -1) {
--- a/src/link/main.c
+++ b/src/link/main.c
@@ -4,8 +4,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "asmotor.h"
-
 #include "extern/err.h"
 #include "link/object.h"
 #include "link/output.h"
@@ -35,8 +33,6 @@
 static void 
 usage(void)
 {
-	printf("RGBLink v" LINK_VERSION " (part of ASMotor " ASMOTOR_VERSION
-	    ")\n\n");
 	printf("usage: rgblink [-t] [-m mapfile] [-n symfile] [-o outfile]\n");
 	printf("\t    [-s symbol] [-z pad_value] objectfile [...]\n");
 
--- a/src/link/mapfile.c
+++ b/src/link/mapfile.c
@@ -3,8 +3,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "asmotor.h"
-
 #include "extern/err.h"
 #include "link/main.h"
 #include "link/mylink.h"
@@ -34,7 +32,7 @@
 		err(1, "Cannot open symfile '%s'", name);
 	}
 
-	fprintf(sf, ";File generated by xLink v" LINK_VERSION "\n\n");
+	fprintf(sf, ";File generated by rgblink\n\n");
 }
 
 void