mirror of
https://github.com/cc65/cc65.git
synced 2025-02-02 15:37:58 +00:00
Moved most platform assembler includes into asminc, so they will be available
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:
parent
31f6f814af
commit
5c5d01d84a
@ -13,7 +13,7 @@ AS = ../../src/ca65/ca65
|
||||
CC = ../../src/cc65/cc65
|
||||
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
|
||||
|
||||
#--------------------------------------------------------------------------
|
||||
|
@ -13,7 +13,7 @@ AS = ../../src/ca65/ca65
|
||||
CC = ../../src/cc65/cc65
|
||||
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
|
||||
|
||||
#--------------------------------------------------------------------------
|
||||
|
@ -30,7 +30,7 @@ AS = ../../src/ca65/ca65
|
||||
CC = ../../src/cc65/cc65
|
||||
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
|
||||
|
||||
#--------------------------------------------------------------------------
|
||||
|
@ -13,7 +13,7 @@ AS = ../../src/ca65/ca65
|
||||
CC = ../../src/cc65/cc65
|
||||
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
|
||||
|
||||
#--------------------------------------------------------------------------
|
||||
|
@ -13,7 +13,7 @@ AS = ../../src/ca65/ca65
|
||||
CC = ../../src/cc65/cc65
|
||||
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
|
||||
|
||||
#--------------------------------------------------------------------------
|
||||
|
@ -9,7 +9,7 @@
|
||||
.destructor _reset_brk
|
||||
.export _brk_a, _brk_x, _brk_y, _brk_sr, _brk_pc
|
||||
|
||||
.include "../plus4/plus4.inc"
|
||||
.include "plus4.inc"
|
||||
|
||||
|
||||
.bss
|
||||
|
@ -9,7 +9,7 @@
|
||||
|
||||
.include "em-kernel.inc"
|
||||
.include "em-error.inc"
|
||||
.include "../plus4/plus4.inc"
|
||||
.include "plus4.inc"
|
||||
|
||||
.macpack generic
|
||||
|
||||
|
@ -7,7 +7,7 @@
|
||||
.export _cgetc
|
||||
.import cursor
|
||||
|
||||
.include "../plus4/plus4.inc"
|
||||
.include "plus4.inc"
|
||||
|
||||
|
||||
; --------------------------------------------------------------------------
|
||||
|
@ -6,7 +6,7 @@
|
||||
|
||||
.export _clrscr
|
||||
|
||||
.include "../plus4/plus4.inc"
|
||||
.include "plus4.inc"
|
||||
|
||||
_clrscr = CLRSCR
|
||||
|
||||
|
@ -8,7 +8,7 @@
|
||||
|
||||
.export _textcolor, _bgcolor, _bordercolor
|
||||
|
||||
.include "../plus4/plus4.inc"
|
||||
.include "plus4.inc"
|
||||
|
||||
_textcolor:
|
||||
ldx CHARCOLOR ; get old value
|
||||
|
@ -6,5 +6,5 @@
|
||||
|
||||
.exportzp CURS_X, CURS_Y
|
||||
|
||||
.include "../plus4/plus4.inc"
|
||||
.include "plus4.inc"
|
||||
|
||||
|
@ -10,7 +10,7 @@
|
||||
.import popa, _gotoxy
|
||||
.import PLOT
|
||||
|
||||
.include "../plus4/plus4.inc"
|
||||
.include "plus4.inc"
|
||||
|
||||
|
||||
_cputcxy:
|
||||
|
@ -13,7 +13,7 @@
|
||||
.import __INTERRUPTOR_COUNT__
|
||||
|
||||
.include "zeropage.inc"
|
||||
.include "../plus4/plus4.inc"
|
||||
.include "plus4.inc"
|
||||
|
||||
|
||||
; ------------------------------------------------------------------------
|
||||
|
@ -5,7 +5,7 @@
|
||||
; /* Return the video mode the machine is using */
|
||||
;
|
||||
|
||||
.include "../plus4/plus4.inc"
|
||||
.include "plus4.inc"
|
||||
.include "get_tv.inc"
|
||||
|
||||
|
||||
|
@ -7,7 +7,7 @@
|
||||
.export _kbhit
|
||||
.import return0, return1
|
||||
|
||||
.include "../plus4/plus4.inc"
|
||||
.include "plus4.inc"
|
||||
|
||||
_kbhit:
|
||||
lda KEY_COUNT ; Get number of characters
|
||||
|
@ -25,7 +25,7 @@
|
||||
.constructor initmainargs, 24
|
||||
.import __argc, __argv
|
||||
|
||||
.include "../plus4/plus4.inc"
|
||||
.include "plus4.inc"
|
||||
|
||||
|
||||
|
||||
|
@ -8,7 +8,7 @@
|
||||
.export __randomize
|
||||
.import _srand
|
||||
|
||||
.include "../plus4/plus4.inc"
|
||||
.include "plus4.inc"
|
||||
|
||||
__randomize:
|
||||
ldx TED_VLINELO ; Use TED rasterline as high byte
|
||||
|
@ -6,7 +6,7 @@
|
||||
|
||||
.export _revers
|
||||
|
||||
.include "../plus4/plus4.inc"
|
||||
.include "plus4.inc"
|
||||
|
||||
.proc _revers
|
||||
|
||||
|
@ -14,7 +14,7 @@ AS = ../../src/ca65/ca65
|
||||
CC = ../../src/cc65/cc65
|
||||
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
|
||||
|
||||
#--------------------------------------------------------------------------
|
||||
|
@ -13,7 +13,7 @@ AS = ../../src/ca65/ca65
|
||||
CC = ../../src/cc65/cc65
|
||||
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
|
||||
|
||||
#--------------------------------------------------------------------------
|
||||
|
@ -13,7 +13,7 @@ AS = ../../src/ca65/ca65
|
||||
CC = ../../src/cc65/cc65
|
||||
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
|
||||
|
||||
#--------------------------------------------------------------------------
|
||||
|
@ -14,7 +14,7 @@ AS = ../../src/ca65/ca65
|
||||
CC = ../../src/cc65/cc65
|
||||
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
|
||||
|
||||
#--------------------------------------------------------------------------
|
||||
|
@ -13,7 +13,7 @@ AS = ../../src/ca65/ca65
|
||||
CC = ../../src/cc65/cc65
|
||||
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
|
||||
|
||||
#--------------------------------------------------------------------------
|
||||
|
@ -13,7 +13,7 @@ AS = ../../src/ca65/ca65
|
||||
CC = ../../src/cc65/cc65
|
||||
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
|
||||
|
||||
#--------------------------------------------------------------------------
|
||||
|
@ -9,7 +9,7 @@
|
||||
|
||||
.include "joy-kernel.inc"
|
||||
.include "joy-error.inc"
|
||||
.include "../plus4/plus4.inc"
|
||||
.include "plus4.inc"
|
||||
|
||||
.macpack generic
|
||||
|
||||
|
@ -13,7 +13,7 @@ AS = ../../src/ca65/ca65
|
||||
CC = ../../src/cc65/cc65
|
||||
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
|
||||
|
||||
#--------------------------------------------------------------------------
|
||||
|
@ -13,7 +13,7 @@ AS = ../../src/ca65/ca65
|
||||
CC = ../../src/cc65/cc65
|
||||
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
|
||||
|
||||
#--------------------------------------------------------------------------
|
||||
|
Loading…
x
Reference in New Issue
Block a user