From c6831e936a9e156893741e0f0c90efbf89d9ffc5 Mon Sep 17 00:00:00 2001 From: uz Date: Fri, 18 Dec 2009 11:58:50 +0000 Subject: [PATCH] Added --forget-inc-paths to the assembler command line to avoid problems if more than one version of ca65 is installed on the machine (Spiro Trikaliotis). git-svn-id: svn://svn.cc65.org/cc65/trunk@4530 b7a2c559-68d2-44c3-8de9-860c34a00d81 --- libsrc/atmos/Makefile | 2 +- libsrc/cbm/Makefile | 2 +- libsrc/common/Makefile | 2 +- libsrc/conio/Makefile | 2 +- libsrc/dbg/Makefile | 2 +- libsrc/em/Makefile | 2 +- libsrc/joystick/Makefile | 2 +- libsrc/pet/Makefile | 2 +- libsrc/runtime/Makefile | 2 +- libsrc/serial/Makefile | 2 +- libsrc/tgi/Makefile | 2 +- libsrc/zlib/Makefile | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/libsrc/atmos/Makefile b/libsrc/atmos/Makefile index 1f025f620..fb2376b4e 100644 --- a/libsrc/atmos/Makefile +++ b/libsrc/atmos/Makefile @@ -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 #-------------------------------------------------------------------------- diff --git a/libsrc/cbm/Makefile b/libsrc/cbm/Makefile index 3daa254af..99bf8c1d4 100644 --- a/libsrc/cbm/Makefile +++ b/libsrc/cbm/Makefile @@ -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 #-------------------------------------------------------------------------- diff --git a/libsrc/common/Makefile b/libsrc/common/Makefile index b92a02a14..e3103e460 100644 --- a/libsrc/common/Makefile +++ b/libsrc/common/Makefile @@ -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 #-------------------------------------------------------------------------- diff --git a/libsrc/conio/Makefile b/libsrc/conio/Makefile index 9fb54428b..7a3fa77e2 100644 --- a/libsrc/conio/Makefile +++ b/libsrc/conio/Makefile @@ -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 #-------------------------------------------------------------------------- diff --git a/libsrc/dbg/Makefile b/libsrc/dbg/Makefile index a7fbe923f..13ca1a17b 100644 --- a/libsrc/dbg/Makefile +++ b/libsrc/dbg/Makefile @@ -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 #-------------------------------------------------------------------------- diff --git a/libsrc/em/Makefile b/libsrc/em/Makefile index 9061fca1d..2507c7abb 100644 --- a/libsrc/em/Makefile +++ b/libsrc/em/Makefile @@ -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 #-------------------------------------------------------------------------- diff --git a/libsrc/joystick/Makefile b/libsrc/joystick/Makefile index bc59422b0..884ad06fd 100644 --- a/libsrc/joystick/Makefile +++ b/libsrc/joystick/Makefile @@ -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 #-------------------------------------------------------------------------- diff --git a/libsrc/pet/Makefile b/libsrc/pet/Makefile index 7772573f1..911f9b3ab 100644 --- a/libsrc/pet/Makefile +++ b/libsrc/pet/Makefile @@ -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 #-------------------------------------------------------------------------- diff --git a/libsrc/runtime/Makefile b/libsrc/runtime/Makefile index 7ab599219..23daed8fd 100644 --- a/libsrc/runtime/Makefile +++ b/libsrc/runtime/Makefile @@ -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 #-------------------------------------------------------------------------- diff --git a/libsrc/serial/Makefile b/libsrc/serial/Makefile index 51407e610..b6b3c946d 100644 --- a/libsrc/serial/Makefile +++ b/libsrc/serial/Makefile @@ -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 #-------------------------------------------------------------------------- diff --git a/libsrc/tgi/Makefile b/libsrc/tgi/Makefile index 17f60a904..a7f053ca3 100644 --- a/libsrc/tgi/Makefile +++ b/libsrc/tgi/Makefile @@ -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 #-------------------------------------------------------------------------- diff --git a/libsrc/zlib/Makefile b/libsrc/zlib/Makefile index 53d22743e..d00a1709c 100644 --- a/libsrc/zlib/Makefile +++ b/libsrc/zlib/Makefile @@ -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 #-------------------------------------------------------------------------- -- 2.39.5