Finished implemenation of commands to delete macros. Added the new commands to

[cc65] / src / ca65 / global.c

diff --git a/src/ca65/global.c b/src/ca65/global.c
index 6adc46d4cab890c5364447df8d47c825ae5db7ad..e934652ec2ed197ce5b308c5edf60422b7fc0824 100644 (file)
--- a/src/ca65/global.c
+++ b/src/ca65/global.c
@@ -1,15 +1,15 @@
 /*****************************************************************************/
 /*                                                                           */
-/*                                global.c                                  */
+/*                                global.c                                  */
 /*                                                                           */
 /*              Global variables for the ca65 macroassembler                */
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 1998-2002 Ullrich von Bassewitz                                       */
-/*               Wacholderweg 14                                             */
-/*               D-70597 Stuttgart                                           */
-/* EMail:        uz@musoftware.de                                            */
+/* (C) 1998-2011, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -33,6 +33,10 @@
 
 
 
+/* common */
+#include "addrsize.h"
+
+/* ca65 */
 #include "global.h"
 
 
@@ -46,11 +50,12 @@
 /* File names */
 const char* InFile                      = 0;   /* Name of input file */
 const char* OutFile                     = 0;   /* Name of output file */
-const char* ListFile                    = 0;   /* Name of listing file */
+StrBuf ListingName = STATIC_STRBUF_INITIALIZER; /* Name of listing file */
+StrBuf DepName     = STATIC_STRBUF_INITIALIZER; /* Dependency file */
+StrBuf FullDepName = STATIC_STRBUF_INITIALIZER; /* Full dependency file */
 
 /* Default extensions */
 const char ObjExt[]                     = ".o";/* Default object extension */
-const char ListExt[]                    = ".lst"; /* Default listing extension */
 
 char LocalStart                         = '@'; /* This char starts local symbols */
 
@@ -58,7 +63,6 @@ unsigned char IgnoreCase         = 0;   /* Ignore case on identifiers? */
 unsigned char AutoImport         = 0;   /* Mark unresolveds as import */
 unsigned char SmartMode                 = 0;   /* Smart mode */
 unsigned char DbgSyms           = 0;   /* Add debug symbols */
-unsigned char Listing                   = 0;   /* Create listing file */
 unsigned char LineCont          = 0;   /* Allow line continuation */
 
 /* Emulation features */
@@ -70,6 +74,13 @@ unsigned char AtInIdents         = 0;        /* Allow '@' in identifiers */
 unsigned char DollarInIdents     = 0;   /* Allow '$' in identifiers */
 unsigned char LeadingDotInIdents = 0;   /* Allow '.' to start an identifier */
 unsigned char PCAssignment       = 0;  /* Allow "* = $XXX" or "$ = $XXX" */
+unsigned char MissingCharTerm    = 0;   /* Allow lda #'a (no closing term) */
+unsigned char UbiquitousIdents   = 0;   /* Allow ubiquitous identifiers */
+unsigned char OrgPerSeg          = 0;   /* Make .org local to current seg */
+unsigned char CComments          = 0;   /* Allow C like comments */
+
+/* Misc stuff */
+const char Copyright[]           = "(C) Copyright 1998-2011 Ullrich von Bassewitz";