From 7e6b77f41b788e6ce24007a920a2c1ade3657ba0 Mon Sep 17 00:00:00 2001 From: Oliver Schmidt Date: Mon, 29 Apr 2019 16:31:59 +0200 Subject: [PATCH] Build combo driver wrapper individually for each target. The set of relevant drivers is after all different for each target. Building the combo driver wrapper individually opens the option to use .ifdef's to only include the drivers relevant for a certain target. --- drivers/Makefile | 8 ++++---- drivers/a2combo.s | 24 ++++++++++++++++++++++++ drivers/c64combo.s | 24 ++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 drivers/a2combo.s create mode 100644 drivers/c64combo.s diff --git a/drivers/Makefile b/drivers/Makefile index 251af1b..ea28efc 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -118,9 +118,9 @@ c64eth64.lib: c64init.o eth64.o $(LAN91C96OBJS) $(C64OBJS) c64wiz811.lib: c64init.o wiz811mj.o $(W5100OBJS) $(C64OBJS) -c64combo.lib: c64init.o rr-net.o eth64.o wiz811mj.o ethernetcombo.o $(C64OBJS) +c64combo.lib: c64init.o rr-net.o eth64.o wiz811mj.o c64combo.o $(C64OBJS) -ip65_c64.lib: c64init.o rr-net.o eth64.o wiz811mj.o ethernetcombo.o $(C64_OBJS) +ip65_c64.lib: c64init.o rr-net.o eth64.o wiz811mj.o c64combo.o $(C64_OBJS) a2uther.lib: a2init.o uthernet.o $(CS8900AOBJS) $(A2OBJS) @@ -128,9 +128,9 @@ a2lancegs.lib: a2init.o lancegs.o $(LAN91C96OBJS) $(A2OBJS) a2uther2.lib: a2init.o uthernet2.o $(W5100OBJS) $(A2OBJS) -a2combo.lib: a2initcombo.o uthernet.o lancegs.o uthernet2.o ethernetcombo.o $(A2OBJS) +a2combo.lib: a2initcombo.o uthernet.o lancegs.o uthernet2.o a2combo.o $(A2OBJS) -ip65_apple2.lib: a2initcombo.o uthernet.o lancegs.o uthernet2.o ethernetcombo.o $(A2_OBJS) +ip65_apple2.lib: a2initcombo.o uthernet.o lancegs.o uthernet2.o a2combo.o $(A2_OBJS) ip65_apple2_uther2.lib: a2init.o uthernet2.o $(W5100OBJS) $(A2_OBJS) diff --git a/drivers/a2combo.s b/drivers/a2combo.s new file mode 100644 index 0000000..9fefe1d --- /dev/null +++ b/drivers/a2combo.s @@ -0,0 +1,24 @@ +__APPLE2__ = 1 + +.include "ethernetcombo.s" + + + +; -- LICENSE FOR a2combo.s -- +; The contents of this file are subject to the Mozilla Public License +; Version 1.1 (the "License"); you may not use this file except in +; compliance with the License. You may obtain a copy of the License at +; http://www.mozilla.org/MPL/ +; +; Software distributed under the License is distributed on an "AS IS" +; basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the +; License for the specific language governing rights and limitations +; under the License. +; +; The Original Code is ip65. +; +; The Initial Developer of the Original Code is Jonno Downes, +; jonno@jamtronix.com. +; Portions created by the Initial Developer are Copyright (C) 2009 +; Jonno Downes. All Rights Reserved. +; -- LICENSE END -- diff --git a/drivers/c64combo.s b/drivers/c64combo.s new file mode 100644 index 0000000..2ae2e2e --- /dev/null +++ b/drivers/c64combo.s @@ -0,0 +1,24 @@ +__CBM__ = 1 + +.include "ethernetcombo.s" + + + +; -- LICENSE FOR c64combo.s -- +; The contents of this file are subject to the Mozilla Public License +; Version 1.1 (the "License"); you may not use this file except in +; compliance with the License. You may obtain a copy of the License at +; http://www.mozilla.org/MPL/ +; +; Software distributed under the License is distributed on an "AS IS" +; basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the +; License for the specific language governing rights and limitations +; under the License. +; +; The Original Code is ip65. +; +; The Initial Developer of the Original Code is Jonno Downes, +; jonno@jamtronix.com. +; Portions created by the Initial Developer are Copyright (C) 2009 +; Jonno Downes. All Rights Reserved. +; -- LICENSE END --