6502/cc65
1
0
Fork 0
mirror of https://github.com/cc65/cc65.git synced 2025-02-02 15:37:58 +00:00
Code Issues Projects Releases Wiki Activity

Moved most platform assembler includes into asminc, so they will be available

Browse Source 
in the distribution. 
Added --forget-inc-paths to the command line of the assembler in the
Makefiles, because the assembler does now have builtin paths and will find
include files from an installation first.
Hopefully fixed any problems that arose from the two changes.


git-svn-id: svn://svn.cc65.org/cc65/trunk@4223 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
uz 2009-09-24 17:44:22 +00:00
parent 31f6f814af
commit 5c5d01d84a
35 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
libsrc/c128/c128.inc → asminc/c128.inc
View File

0
libsrc/c64/c64.inc → asminc/c64.inc
View File

0
libsrc/cbm510/cbm510.inc → asminc/cbm510.inc
View File

0
libsrc/cbm610/cbm610.inc → asminc/cbm610.inc
View File

0
libsrc/nes/nes.inc → asminc/nes.inc
View File

0
libsrc/plus4/plus4.inc → asminc/plus4.inc
View File

0
libsrc/supervision/supervision.inc → asminc/supervision.inc
View File

0
libsrc/vic20/vic20.inc → asminc/vic20.inc
View File

2
libsrc/apple2/Makefile
View File

@ -13,7 +13,7 @@ AS = ../../src/ca65/ca65
CC = ../../src/cc65/cc65 CC = ../../src/cc65/cc65
LD = ../../src/ld65/ld65 LD = ../../src/ld65/ld65
AFLAGS = -t $(SYS) -I../../asminc AFLAGS = -t $(SYS) --forget-inc-paths -I../../asminc
CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include
#-------------------------------------------------------------------------- #--------------------------------------------------------------------------

2
libsrc/apple2enh/Makefile
View File

@ -13,7 +13,7 @@ AS = ../../src/ca65/ca65
CC = ../../src/cc65/cc65 CC = ../../src/cc65/cc65
LD = ../../src/ld65/ld65 LD = ../../src/ld65/ld65
AFLAGS = -t $(SYS) -I../apple2 -I../../asminc AFLAGS = -t $(SYS) --forget-inc-paths -I../apple2 -I../../asminc
CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I ../apple2 -I ../../include CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I ../apple2 -I ../../include
#-------------------------------------------------------------------------- #--------------------------------------------------------------------------

2
libsrc/atari/Makefile
View File

@ -30,7 +30,7 @@ AS = ../../src/ca65/ca65
CC = ../../src/cc65/cc65 CC = ../../src/cc65/cc65
LD = ../../src/ld65/ld65 LD = ../../src/ld65/ld65
AFLAGS = -t $(SYS) -I../../asminc AFLAGS = -t $(SYS) --forget-inc-paths -I../../asminc
CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include
#-------------------------------------------------------------------------- #--------------------------------------------------------------------------

2
libsrc/c128/Makefile
View File

@ -13,7 +13,7 @@ AS = ../../src/ca65/ca65
CC = ../../src/cc65/cc65 CC = ../../src/cc65/cc65
LD = ../../src/ld65/ld65 LD = ../../src/ld65/ld65
AFLAGS = -t $(SYS) -I../../asminc AFLAGS = -t $(SYS) --forget-inc-paths -I../../asminc
CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include
#-------------------------------------------------------------------------- #--------------------------------------------------------------------------

2
libsrc/c16/Makefile
View File

@ -13,7 +13,7 @@ AS = ../../src/ca65/ca65
CC = ../../src/cc65/cc65 CC = ../../src/cc65/cc65
LD = ../../src/ld65/ld65 LD = ../../src/ld65/ld65
AFLAGS = -t $(SYS) -I../../asminc AFLAGS = -t $(SYS) --forget-inc-paths -I. -I../../asminc
CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include
#-------------------------------------------------------------------------- #--------------------------------------------------------------------------

2
libsrc/c16/break.s
View File

@ -9,7 +9,7 @@
.destructor _reset_brk .destructor _reset_brk
.export _brk_a, _brk_x, _brk_y, _brk_sr, _brk_pc .export _brk_a, _brk_x, _brk_y, _brk_sr, _brk_pc
.include "../plus4/plus4.inc" .include "plus4.inc"
.bss .bss

2
libsrc/c16/c16-ram.s
View File

@ -9,7 +9,7 @@
.include "em-kernel.inc" .include "em-kernel.inc"
.include "em-error.inc" .include "em-error.inc"
.include "../plus4/plus4.inc" .include "plus4.inc"
.macpack generic .macpack generic

2
libsrc/c16/cgetc.s
View File

@ -7,7 +7,7 @@
.export _cgetc .export _cgetc
.import cursor .import cursor
.include "../plus4/plus4.inc" .include "plus4.inc"
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------

2
libsrc/c16/clrscr.s
View File

@ -6,7 +6,7 @@
.export _clrscr .export _clrscr
.include "../plus4/plus4.inc" .include "plus4.inc"
_clrscr = CLRSCR _clrscr = CLRSCR

2
libsrc/c16/color.s
View File

@ -8,7 +8,7 @@
.export _textcolor, _bgcolor, _bordercolor .export _textcolor, _bgcolor, _bordercolor
.include "../plus4/plus4.inc" .include "plus4.inc"
_textcolor: _textcolor:
ldx CHARCOLOR ; get old value ldx CHARCOLOR ; get old value

2
libsrc/c16/conio.s
View File

@ -6,5 +6,5 @@
.exportzp CURS_X, CURS_Y .exportzp CURS_X, CURS_Y
.include "../plus4/plus4.inc" .include "plus4.inc"

2
libsrc/c16/cputc.s
View File

@ -10,7 +10,7 @@
.import popa, _gotoxy .import popa, _gotoxy
.import PLOT .import PLOT
.include "../plus4/plus4.inc" .include "plus4.inc"
_cputcxy: _cputcxy:

2
libsrc/c16/crt0.s
View File

@ -13,7 +13,7 @@
.import __INTERRUPTOR_COUNT__ .import __INTERRUPTOR_COUNT__
.include "zeropage.inc" .include "zeropage.inc"
.include "../plus4/plus4.inc" .include "plus4.inc"
; ------------------------------------------------------------------------ ; ------------------------------------------------------------------------

2
libsrc/c16/get_tv.s
View File

@ -5,7 +5,7 @@
; /* Return the video mode the machine is using */ ; /* Return the video mode the machine is using */
; ;
.include "../plus4/plus4.inc" .include "plus4.inc"
.include "get_tv.inc" .include "get_tv.inc"

2
libsrc/c16/kbhit.s
View File

@ -7,7 +7,7 @@
.export _kbhit .export _kbhit
.import return0, return1 .import return0, return1
.include "../plus4/plus4.inc" .include "plus4.inc"
_kbhit: _kbhit:
lda KEY_COUNT ; Get number of characters lda KEY_COUNT ; Get number of characters

2
libsrc/c16/mainargs.s
View File

@ -25,7 +25,7 @@
.constructor initmainargs, 24 .constructor initmainargs, 24
.import __argc, __argv .import __argc, __argv
.include "../plus4/plus4.inc" .include "plus4.inc"

2
libsrc/c16/randomize.s
View File

@ -8,7 +8,7 @@
.export __randomize .export __randomize
.import _srand .import _srand
.include "../plus4/plus4.inc" .include "plus4.inc"
__randomize: __randomize:
ldx TED_VLINELO ; Use TED rasterline as high byte ldx TED_VLINELO ; Use TED rasterline as high byte

2
libsrc/c16/revers.s
View File

@ -6,7 +6,7 @@
.export _revers .export _revers
.include "../plus4/plus4.inc" .include "plus4.inc"
.proc _revers .proc _revers

2
libsrc/c64/Makefile
View File

@ -14,7 +14,7 @@ AS = ../../src/ca65/ca65
CC = ../../src/cc65/cc65 CC = ../../src/cc65/cc65
LD = ../../src/ld65/ld65 LD = ../../src/ld65/ld65
AFLAGS = -t $(SYS) -I../../asminc AFLAGS = -t $(SYS) --forget-inc-paths -I../../asminc
CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include
#-------------------------------------------------------------------------- #--------------------------------------------------------------------------

2
libsrc/cbm510/Makefile
View File

@ -13,7 +13,7 @@ AS = ../../src/ca65/ca65
CC = ../../src/cc65/cc65 CC = ../../src/cc65/cc65
LD = ../../src/ld65/ld65 LD = ../../src/ld65/ld65
AFLAGS = -t $(SYS) -I../../asminc AFLAGS = -t $(SYS) --forget-inc-paths -I../../asminc
CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include
#-------------------------------------------------------------------------- #--------------------------------------------------------------------------

2
libsrc/cbm610/Makefile
View File

@ -13,7 +13,7 @@ AS = ../../src/ca65/ca65
CC = ../../src/cc65/cc65 CC = ../../src/cc65/cc65
LD = ../../src/ld65/ld65 LD = ../../src/ld65/ld65
AFLAGS = -t $(SYS) -I../../asminc AFLAGS = -t $(SYS) --forget-inc-paths -I../../asminc
CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include
#-------------------------------------------------------------------------- #--------------------------------------------------------------------------

2
libsrc/lynx/Makefile
View File

@ -14,7 +14,7 @@ AS = ../../src/ca65/ca65
CC = ../../src/cc65/cc65 CC = ../../src/cc65/cc65
LD = ../../src/ld65/ld65 LD = ../../src/ld65/ld65
AFLAGS = -t $(SYS) -I../../asminc AFLAGS = -t $(SYS) --forget-inc-paths -I../../asminc
CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include
#-------------------------------------------------------------------------- #--------------------------------------------------------------------------

2
libsrc/nes/Makefile
View File

@ -13,7 +13,7 @@ AS = ../../src/ca65/ca65
CC = ../../src/cc65/cc65 CC = ../../src/cc65/cc65
LD = ../../src/ld65/ld65 LD = ../../src/ld65/ld65
AFLAGS = -t $(SYS) -I../../asminc AFLAGS = -t $(SYS) --forget-inc-paths -I../../asminc
CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include
#-------------------------------------------------------------------------- #--------------------------------------------------------------------------

2
libsrc/plus4/Makefile
View File

@ -13,7 +13,7 @@ AS = ../../src/ca65/ca65
CC = ../../src/cc65/cc65 CC = ../../src/cc65/cc65
LD = ../../src/ld65/ld65 LD = ../../src/ld65/ld65
AFLAGS = -t $(SYS) -I../../asminc AFLAGS = -t $(SYS) --forget-inc-paths -I../../asminc
CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include
#-------------------------------------------------------------------------- #--------------------------------------------------------------------------

2
libsrc/plus4/plus4-stdjoy.s
View File

@ -9,7 +9,7 @@
.include "joy-kernel.inc" .include "joy-kernel.inc"
.include "joy-error.inc" .include "joy-error.inc"
.include "../plus4/plus4.inc" .include "plus4.inc"
.macpack generic .macpack generic

2
libsrc/supervision/Makefile
View File

@ -13,7 +13,7 @@ AS = ../../src/ca65/ca65
CC = ../../src/cc65/cc65 CC = ../../src/cc65/cc65
LD = ../../src/ld65/ld65 LD = ../../src/ld65/ld65
AFLAGS = -t $(SYS) -I../../asminc AFLAGS = -t $(SYS) --forget-inc-paths -I../../asminc
CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include
#-------------------------------------------------------------------------- #--------------------------------------------------------------------------

2
libsrc/vic20/Makefile
View File

@ -13,7 +13,7 @@ AS = ../../src/ca65/ca65
CC = ../../src/cc65/cc65 CC = ../../src/cc65/cc65
LD = ../../src/ld65/ld65 LD = ../../src/ld65/ld65
AFLAGS=-t $(SYS) -I../../asminc AFLAGS=-t $(SYS) --forget-inc-paths -I../../asminc
CFLAGS=-Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include CFLAGS=-Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include
#-------------------------------------------------------------------------- #--------------------------------------------------------------------------