the10thwiz/cc65
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Have __APPLE2ENH__ imply __APPLE2__ and __ATARIXL__ imply __ATARI__.

Browse Source
This commit is contained in:
Oliver Schmidt
2013-06-17 21:34:08 +02:00
parent 92ad74a49f
commit 83280e1ee2
16 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
asminc/stdio.inc
View File

@@ -41,9 +41,9 @@ _IOLBF = 1
_IONBF = 2 _IONBF = 2
BUFSIZ = 256 BUFSIZ = 256
EOF = -1 EOF = -1
.if .defined(__APPLE2__) .or .defined(__APPLE2ENH__) .if .defined(__APPLE2__)
FILENAME_MAX = 64+1 FILENAME_MAX = 64+1
.elseif .defined(__ATARI__) .or .defined(__ATARIXL__) .elseif .defined(__ATARI__)
FILENAME_MAX = 12+1 FILENAME_MAX = 12+1
.elseif .defined(__LUNIX__) .elseif .defined(__LUNIX__)
FILENAME_MAX = 80+1 FILENAME_MAX = 80+1

4
include/apple2.h
View File

@@ -37,7 +37,7 @@
/* Check for errors */ /* Check for errors */
#if !defined(__APPLE2__) && !defined(__APPLE2ENH__) #if !defined(__APPLE2__)
# error This module may only be used when compiling for the Apple ][! # error This module may only be used when compiling for the Apple ][!
#endif #endif
@@ -142,7 +142,7 @@ extern unsigned char _filetype; /* Default 6 */
extern unsigned int _auxtype; /* Default 0 */ extern unsigned int _auxtype; /* Default 0 */
/* The addresses of the static drivers */ /* The addresses of the static drivers */
#ifndef __APPLE2ENH__ #if !defined(__APPLE2ENH__)
extern void a2_auxmem_emd[]; extern void a2_auxmem_emd[];
extern void a2_stdjoy_joy[]; /* Referred to by joy_static_stddrv[] */ extern void a2_stdjoy_joy[]; /* Referred to by joy_static_stddrv[] */
extern void a2_stdmou_mou[]; /* Referred to by mouse_static_stddrv[] */ extern void a2_stdmou_mou[]; /* Referred to by mouse_static_stddrv[] */

2
include/atari.h
View File

@@ -38,7 +38,7 @@
/* Check for errors */ /* Check for errors */
#if !defined(__ATARI__) && !defined(__ATARIXL__) #if !defined(__ATARI__)
# error This module may only be used when compiling for the Atari! # error This module may only be used when compiling for the Atari!
#endif #endif

8
include/conio.h
View File

@@ -59,11 +59,11 @@
#endif #endif
/* Include the correct machine-specific file */ /* Include the correct machine-specific file */
#if defined(__APPLE2__) #if defined(__APPLE2ENH__)
# include <apple2.h>
#elif defined(__APPLE2ENH__)
# include <apple2enh.h> # include <apple2enh.h>
#elif defined(__ATARI__) || defined(__ATARIXL__) #elif defined(__APPLE2__)
# include <apple2.h>
#elif defined(__ATARI__)
# include <atari.h> # include <atari.h>
#elif defined(__ATMOS__) #elif defined(__ATMOS__)
# include <atmos.h> # include <atmos.h>

4
include/dirent.h
View File

@@ -43,7 +43,7 @@
typedef struct DIR DIR; typedef struct DIR DIR;
#if defined(__APPLE2__) || defined(__APPLE2ENH__) #if defined(__APPLE2__)
struct dirent { struct dirent {
char d_name[16]; char d_name[16];
@@ -78,7 +78,7 @@ struct dirent {
#define _DE_ISLBL(t) (0) #define _DE_ISLBL(t) (0)
#define _DE_ISLNK(t) (0) #define _DE_ISLNK(t) (0)
#elif defined(__ATARI__) || defined(__ATARIXL__) #elif defined(__ATARI__)
struct dirent { struct dirent {
char d_name[13]; /* 8.3 + trailing 0 */ char d_name[13]; /* 8.3 + trailing 0 */

4
include/stdio.h
View File

@@ -69,9 +69,9 @@ extern FILE* stderr;
#define TMP_MAX 256 #define TMP_MAX 256
/* Standard defines that are platform dependent */ /* Standard defines that are platform dependent */
#if defined(__APPLE2__) || defined(__APPLE2ENH__) #if defined(__APPLE2__)
# define FILENAME_MAX (64+1) # define FILENAME_MAX (64+1)
#elif defined(__ATARI__) || defined(__ATARIXL__) #elif defined(__ATARI__)
# define FILENAME_MAX (12+1) # define FILENAME_MAX (12+1)
#elif defined(__LUNIX__) #elif defined(__LUNIX__)
# define FILENAME_MAX (80+1) # define FILENAME_MAX (80+1)

2
include/time.h
View File

@@ -76,7 +76,7 @@ extern struct _timezone {
#if defined(__ATARI__) || defined(__ATARIXL__) #if defined(__ATARI__)
/* The clock depends on the video standard, so read it at runtime */ /* The clock depends on the video standard, so read it at runtime */
unsigned _clocks_per_sec (void); unsigned _clocks_per_sec (void);
# define CLK_TCK _clocks_per_sec() # define CLK_TCK _clocks_per_sec()

4
libsrc/dbg/dbg.c
View File

@@ -63,7 +63,7 @@ static char GetKeyUpdate (void);
# define COLOR_FRAMEHIGH COLOR_WHITE # define COLOR_FRAMEHIGH COLOR_WHITE
# define COLOR_FRAMELOW COLOR_GRAY3 # define COLOR_FRAMELOW COLOR_GRAY3
# else # else
# if defined(__APPLE2__) || defined(__APPLE2ENH__) # if defined(__APPLE2__)
# define COLOR_BORDER COLOR_BLACK # define COLOR_BORDER COLOR_BLACK
# define COLOR_BACKGROUND COLOR_BLACK # define COLOR_BACKGROUND COLOR_BLACK
# define COLOR_TEXTHIGH COLOR_BLACK # define COLOR_TEXTHIGH COLOR_BLACK
@@ -93,7 +93,7 @@ static char GetKeyUpdate (void);
# define MAX_X 80 # define MAX_X 80
# define MAX_Y 25 # define MAX_Y 25
# define DUMP_BYTES 16 # define DUMP_BYTES 16
#elif defined(__APPLE2__) || defined(__APPLE2ENH__) || defined(__ATARI__) || defined(__ATARIXL__) #elif defined(__APPLE2__) || defined(__ATARI__)
# define MAX_X 40 # define MAX_X 40
# define MAX_Y 24 # define MAX_Y 24
# define DUMP_BYTES 8 # define DUMP_BYTES 8

2
samples/mandelbrot.c
View File

@@ -28,7 +28,7 @@
#define divfp(_a,_b) ((((signed long)_a)<<fpshift)/(_b)) #define divfp(_a,_b) ((((signed long)_a)<<fpshift)/(_b))
/* Workaround missing clock stuff */ /* Workaround missing clock stuff */
#if defined(__APPLE2__) || defined(__APPLE2ENH__) #ifdef __APPLE2__
# define clock() 0 # define clock() 0
# define CLK_TCK 1 # define CLK_TCK 1
#endif #endif

2
samples/sieve.c
View File

@@ -12,7 +12,7 @@
/* Workaround missing clock stuff */ /* Workaround missing clock stuff */
#if defined(__APPLE2__) || defined(__APPLE2ENH__) #ifdef __APPLE2__
# define clock() 0 # define clock() 0
# define CLOCKS_PER_SEC 1 # define CLOCKS_PER_SEC 1
#endif #endif

2
src/ca65/main.c
View File

@@ -209,6 +209,7 @@ static void SetSys (const char* Sys)
break; break;
case TGT_ATARIXL: case TGT_ATARIXL:
NewSymbol ("__ATARI__", 1);
NewSymbol ("__ATARIXL__", 1); NewSymbol ("__ATARIXL__", 1);
break; break;
@@ -253,6 +254,7 @@ static void SetSys (const char* Sys)
break; break;
case TGT_APPLE2ENH: case TGT_APPLE2ENH:
NewSymbol ("__APPLE2__", 1);
NewSymbol ("__APPLE2ENH__", 1); NewSymbol ("__APPLE2ENH__", 1);
break; break;

2
src/cc65/main.c
View File

@@ -165,6 +165,7 @@ static void SetSys (const char* Sys)
break; break;
case TGT_ATARIXL: case TGT_ATARIXL:
DefineNumericMacro ("__ATARI__", 1);
DefineNumericMacro ("__ATARIXL__", 1); DefineNumericMacro ("__ATARIXL__", 1);
break; break;
@@ -209,6 +210,7 @@ static void SetSys (const char* Sys)
break; break;
case TGT_APPLE2ENH: case TGT_APPLE2ENH:
DefineNumericMacro ("__APPLE2__", 1);
DefineNumericMacro ("__APPLE2ENH__", 1); DefineNumericMacro ("__APPLE2ENH__", 1);
break; break;

4
testcode/lib/em-test.c
View File

@@ -16,10 +16,10 @@
#define DRIVERNAME "cbm510-ram.emd" #define DRIVERNAME "cbm510-ram.emd"
#elif defined(__CBM610__) #elif defined(__CBM610__)
#define DRIVERNAME "cbm610-ram.emd" #define DRIVERNAME "cbm610-ram.emd"
#elif defined(__APPLE2__)
#define DRIVERNAME "a2.auxmem.emd"
#elif defined(__APPLE2ENH__) #elif defined(__APPLE2ENH__)
#define DRIVERNAME "a2e.auxmem.emd" #define DRIVERNAME "a2e.auxmem.emd"
#elif defined(__APPLE2__)
#define DRIVERNAME "a2.auxmem.emd"
#else #else
#define DRIVERNAME "unknown" #define DRIVERNAME "unknown"
#error "Unknown target system" #error "Unknown target system"

4
testcode/lib/ft.c
View File

@@ -25,7 +25,7 @@
extern int getsp(void); /* is provided in getsp.s */ extern int getsp(void); /* is provided in getsp.s */
/* Atari's fd indirection table */ /* Atari's fd indirection table */
#if defined(__ATARI__) || defined(__ATARIXL__) #ifdef __ATARI__
extern char __fd_index[]; extern char __fd_index[];
struct fd_t { struct fd_t {
char usage; char usage;
@@ -74,7 +74,7 @@ int main(int argc,char **argv)
return(0); return(0);
} }
printf("open success -- handle = $%x, sp = %d\n",fd,csp); printf("open success -- handle = $%x, sp = %d\n",fd,csp);
#if defined(__ATARI__) || defined(__ATARIXL__) #ifdef __ATARI__
printf("fd_index:\n "); printf("fd_index:\n ");
for (i=0; i<12; i++) printf("%02X ",__fd_index[i]); for (i=0; i<12; i++) printf("%02X ",__fd_index[i]);
printf("\nfd_table:\n"); printf("\nfd_table:\n");

4
testcode/lib/mul-test.c
View File

@@ -18,7 +18,7 @@ static const unsigned char small_bar[8] = {
' ', 0xa5, 0xb4, 0xb5, 0xa1, 0xb6, 0xaa, 0xa7 ' ', 0xa5, 0xb4, 0xb5, 0xa1, 0xb6, 0xaa, 0xa7
}; };
#elif defined(__ATARI__) || defined(__ATARIXL__) #elif defined(__ATARI__)
#endif #endif
/* Screen co-ordinates for the progress meter */ /* Screen co-ordinates for the progress meter */
@@ -39,7 +39,7 @@ static void ProgressMeter (unsigned Val)
revers (revers_bar[Val]); revers (revers_bar[Val]);
cputc (small_bar[Val]); cputc (small_bar[Val]);
#elif defined(__ATARI__) || defined(__ATARIXL__) #elif defined(__ATARI__)
#endif #endif
revers (0); revers (0);

4
testcode/lib/ser-test.c
View File

@@ -13,10 +13,10 @@
#define DRIVERNAME "plus4-stdser.ser" #define DRIVERNAME "plus4-stdser.ser"
#elif defined(__CBM610__) #elif defined(__CBM610__)
#define DRIVERNAME "cbm610-std.ser" #define DRIVERNAME "cbm610-std.ser"
#elif defined(__APPLE2__)
#define DRIVERNAME "a2.ssc.ser"
#elif defined(__APPLE2ENH__) #elif defined(__APPLE2ENH__)
#define DRIVERNAME "a2e.ssc.ser" #define DRIVERNAME "a2e.ssc.ser"
#elif defined(__APPLE2__)
#define DRIVERNAME "a2.ssc.ser"
#else #else
#define DRIVERNAME "unknown" #define DRIVERNAME "unknown"
#error "Unknown target system" #error "Unknown target system"