Merge pull request #2449 from oliverschmidt/master

Adjusted to cc65 2.17 which generates AppleSingle files.
This commit is contained in:
Oliver Schmidt 2018-03-08 17:43:21 +00:00 committed by GitHub
commit bc2e445817
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 80 additions and 80 deletions

View File

@ -61,19 +61,19 @@ endif
disk: all
cp $(CONTIKI)/tools/$(TARGET)/prodos.dsk contiki.dsk
java -jar $(AC) -p contiki.dsk contiki.system sys < $(CC65_TARGET_DIR)/util/loader.system
java -jar $(AC) -cc65 contiki.dsk contiki bin < $(CONTIKI_PROJECT).$(TARGET)
java -jar $(AC) -p contiki.dsk contiki.system sys < $(CC65_TARGET_DIR)/util/loader.system
java -jar $(AC) -as contiki.dsk contiki < $(CONTIKI_PROJECT).$(TARGET)
ifdef SLIP
java -jar $(AC) -p contiki.dsk contiki.cfg bin 0 < $(CONTIKI)/tools/6502/sample.cfg
java -jar $(AC) -p contiki.dsk contiki.cfg bin 0 < $(CONTIKI)/tools/6502/sample.cfg
else
java -jar $(AC) -p contiki.dsk contiki.cfg bin 0 < $(CONTIKI)/tools/$(TARGET)/sample.cfg
java -jar $(AC) -p contiki.dsk cs8900a.eth rel 0 < cs8900a.eth
java -jar $(AC) -p contiki.dsk lan91c96.eth rel 0 < lan91c96.eth
java -jar $(AC) -p contiki.dsk w5100.eth rel 0 < w5100.eth
java -jar $(AC) -p contiki.dsk contiki.cfg bin 0 < $(CONTIKI)/tools/$(TARGET)/sample.cfg
java -jar $(AC) -p contiki.dsk cs8900a.eth rel 0 < cs8900a.eth
java -jar $(AC) -p contiki.dsk lan91c96.eth rel 0 < lan91c96.eth
java -jar $(AC) -p contiki.dsk w5100.eth rel 0 < w5100.eth
endif
ifeq ($(HTTPD-CFS),1)
java -jar $(AC) -p contiki.dsk index.htm bin 0 < httpd-cfs/index.htm
java -jar $(AC) -p contiki.dsk backgrnd.gif bin 0 < httpd-cfs/backgrnd.gif
java -jar $(AC) -p contiki.dsk contiki.gif bin 0 < httpd-cfs/contiki.gif
java -jar $(AC) -p contiki.dsk notfound.htm bin 0 < httpd-cfs/notfound.htm
java -jar $(AC) -p contiki.dsk index.htm bin 0 < httpd-cfs/index.htm
java -jar $(AC) -p contiki.dsk backgrnd.gif bin 0 < httpd-cfs/backgrnd.gif
java -jar $(AC) -p contiki.dsk contiki.gif bin 0 < httpd-cfs/contiki.gif
java -jar $(AC) -p contiki.dsk notfound.htm bin 0 < httpd-cfs/notfound.htm
endif

View File

@ -99,96 +99,96 @@ contiki-apple2.zip: contiki-apple2-1.dsk contiki-apple2-2.dsk contiki-apple2-3.d
contiki-apple2-1.dsk: apple2enh-makes
cp ../apple2enh/prodos.dsk $@
java -jar $(AC) -p $@ menu.system sys < ../apple2enh/menu.system
java -jar $(AC) -p $@ $(DEV)confi.system sys < $(CC65)/apple2enh/util/loader.system
java -jar $(AC) -cc65 $@ $(DEV)confi bin < ../../cpu/6502/$(DEV)config/$(DEV)config.apple2enh
java -jar $(AC) -p $@ ipconfig.system sys < $(CC65)/apple2enh/util/loader.system
java -jar $(AC) -cc65 $@ ipconfig bin < ../../cpu/6502/ipconfig/ipconfig.apple2enh
java -jar $(AC) -p $@ webbrows.system sys < $(CC65)/apple2enh/util/loader.system
java -jar $(AC) -cc65 $@ webbrows bin < ../../examples/webbrowser-80col/webbrowser.apple2enh
java -jar $(AC) -p $@ wget.system sys < $(CC65)/apple2enh/util/loader.system
java -jar $(AC) -cc65 $@ wget bin < ../../examples/wget/wget.apple2enh
java -jar $(AC) -p $@ menu.system sys < ../apple2enh/menu.system
java -jar $(AC) -p $@ $(DEV)confi.system sys < $(CC65)/apple2enh/util/loader.system
java -jar $(AC) -as $@ $(DEV)confi < ../../cpu/6502/$(DEV)config/$(DEV)config.apple2enh
java -jar $(AC) -p $@ ipconfig.system sys < $(CC65)/apple2enh/util/loader.system
java -jar $(AC) -as $@ ipconfig < ../../cpu/6502/ipconfig/ipconfig.apple2enh
java -jar $(AC) -p $@ webbrows.system sys < $(CC65)/apple2enh/util/loader.system
java -jar $(AC) -as $@ webbrows < ../../examples/webbrowser-80col/webbrowser.apple2enh
java -jar $(AC) -p $@ wget.system sys < $(CC65)/apple2enh/util/loader.system
java -jar $(AC) -as $@ wget < ../../examples/wget/wget.apple2enh
ifdef SLIP
java -jar $(AC) -p $@ contiki.cfg bin 0 < default.cfg
java -jar $(AC) -p $@ contiki.cfg bin 0 < default.cfg
else
java -jar $(AC) -p $@ contiki.cfg bin 0 < ../apple2enh/default.cfg
java -jar $(AC) -p $@ cs8900a.eth rel 0 < ../../cpu/6502/ethconfig/cs8900a.eth
java -jar $(AC) -p $@ lan91c96.eth rel 0 < ../../cpu/6502/ethconfig/lan91c96.eth
java -jar $(AC) -p $@ w5100.eth rel 0 < ../../cpu/6502/ethconfig/w5100.eth
java -jar $(AC) -p $@ contiki.cfg bin 0 < ../apple2enh/default.cfg
java -jar $(AC) -p $@ cs8900a.eth rel 0 < ../../cpu/6502/ethconfig/cs8900a.eth
java -jar $(AC) -p $@ lan91c96.eth rel 0 < ../../cpu/6502/ethconfig/lan91c96.eth
java -jar $(AC) -p $@ w5100.eth rel 0 < ../../cpu/6502/ethconfig/w5100.eth
endif
contiki-apple2-2.dsk: apple2enh-makes
cp ../apple2enh/prodos.dsk $@
java -jar $(AC) -p $@ menu.system sys < ../apple2enh/menu.system
java -jar $(AC) -p $@ $(DEV)confi.system sys < $(CC65)/apple2enh/util/loader.system
java -jar $(AC) -cc65 $@ $(DEV)confi bin < ../../cpu/6502/$(DEV)config/$(DEV)config.apple2enh
java -jar $(AC) -p $@ ipconfig.system sys < $(CC65)/apple2enh/util/loader.system
java -jar $(AC) -cc65 $@ ipconfig bin < ../../cpu/6502/ipconfig/ipconfig.apple2enh
java -jar $(AC) -p $@ irc.system sys < $(CC65)/apple2enh/util/loader.system
java -jar $(AC) -cc65 $@ irc bin < ../../examples/irc-80col/irc-client.apple2enh
java -jar $(AC) -p $@ menu.system sys < ../apple2enh/menu.system
java -jar $(AC) -p $@ $(DEV)confi.system sys < $(CC65)/apple2enh/util/loader.system
java -jar $(AC) -as $@ $(DEV)confi < ../../cpu/6502/$(DEV)config/$(DEV)config.apple2enh
java -jar $(AC) -p $@ ipconfig.system sys < $(CC65)/apple2enh/util/loader.system
java -jar $(AC) -as $@ ipconfig < ../../cpu/6502/ipconfig/ipconfig.apple2enh
java -jar $(AC) -p $@ irc.system sys < $(CC65)/apple2enh/util/loader.system
java -jar $(AC) -as $@ irc < ../../examples/irc-80col/irc-client.apple2enh
ifdef SLIP
java -jar $(AC) -p $@ contiki.cfg bin 0 < default.cfg
java -jar $(AC) -p $@ contiki.cfg bin 0 < default.cfg
else
java -jar $(AC) -p $@ contiki.cfg bin 0 < ../apple2enh/default.cfg
java -jar $(AC) -p $@ cs8900a.eth rel 0 < ../../cpu/6502/ethconfig/cs8900a.eth
java -jar $(AC) -p $@ lan91c96.eth rel 0 < ../../cpu/6502/ethconfig/lan91c96.eth
java -jar $(AC) -p $@ w5100.eth rel 0 < ../../cpu/6502/ethconfig/w5100.eth
java -jar $(AC) -p $@ contiki.cfg bin 0 < ../apple2enh/default.cfg
java -jar $(AC) -p $@ cs8900a.eth rel 0 < ../../cpu/6502/ethconfig/cs8900a.eth
java -jar $(AC) -p $@ lan91c96.eth rel 0 < ../../cpu/6502/ethconfig/lan91c96.eth
java -jar $(AC) -p $@ w5100.eth rel 0 < ../../cpu/6502/ethconfig/w5100.eth
endif
contiki-apple2-3.dsk: apple2enh-makes
cp ../apple2enh/prodos.dsk $@
java -jar $(AC) -p $@ menu.system sys < ../apple2enh/menu.system
java -jar $(AC) -p $@ $(DEV)confi.system sys < $(CC65)/apple2enh/util/loader.system
java -jar $(AC) -cc65 $@ $(DEV)confi bin < ../../cpu/6502/$(DEV)config/$(DEV)config.apple2enh
java -jar $(AC) -p $@ ipconfig.system sys < $(CC65)/apple2enh/util/loader.system
java -jar $(AC) -cc65 $@ ipconfig bin < ../../cpu/6502/ipconfig/ipconfig.apple2enh
java -jar $(AC) -p $@ webserv.system sys < $(CC65)/apple2enh/util/loader.system
java -jar $(AC) -cc65 $@ webserv bin < ../../examples/webserver/webserver-example.apple2enh
java -jar $(AC) -p $@ telnetd.system sys < $(CC65)/apple2enh/util/loader.system
java -jar $(AC) -cc65 $@ telnetd bin < ../../examples/telnet-server/telnet-server.apple2enh
java -jar $(AC) -p $@ menu.system sys < ../apple2enh/menu.system
java -jar $(AC) -p $@ $(DEV)confi.system sys < $(CC65)/apple2enh/util/loader.system
java -jar $(AC) -as $@ $(DEV)confi < ../../cpu/6502/$(DEV)config/$(DEV)config.apple2enh
java -jar $(AC) -p $@ ipconfig.system sys < $(CC65)/apple2enh/util/loader.system
java -jar $(AC) -as $@ ipconfig < ../../cpu/6502/ipconfig/ipconfig.apple2enh
java -jar $(AC) -p $@ webserv.system sys < $(CC65)/apple2enh/util/loader.system
java -jar $(AC) -as $@ webserv < ../../examples/webserver/webserver-example.apple2enh
java -jar $(AC) -p $@ telnetd.system sys < $(CC65)/apple2enh/util/loader.system
java -jar $(AC) -as $@ telnetd < ../../examples/telnet-server/telnet-server.apple2enh
ifdef SLIP
java -jar $(AC) -p $@ contiki.cfg bin 0 < default.cfg
java -jar $(AC) -p $@ contiki.cfg bin 0 < default.cfg
else
java -jar $(AC) -p $@ contiki.cfg bin 0 < ../apple2enh/default.cfg
java -jar $(AC) -p $@ cs8900a.eth rel 0 < ../../cpu/6502/ethconfig/cs8900a.eth
java -jar $(AC) -p $@ lan91c96.eth rel 0 < ../../cpu/6502/ethconfig/lan91c96.eth
java -jar $(AC) -p $@ w5100.eth rel 0 < ../../cpu/6502/ethconfig/w5100.eth
java -jar $(AC) -p $@ contiki.cfg bin 0 < ../apple2enh/default.cfg
java -jar $(AC) -p $@ cs8900a.eth rel 0 < ../../cpu/6502/ethconfig/cs8900a.eth
java -jar $(AC) -p $@ lan91c96.eth rel 0 < ../../cpu/6502/ethconfig/lan91c96.eth
java -jar $(AC) -p $@ w5100.eth rel 0 < ../../cpu/6502/ethconfig/w5100.eth
endif
java -jar $(AC) -p $@ index.htm bin 0 < ../../examples/webserver/httpd-cfs/index.htm
java -jar $(AC) -p $@ backgrnd.gif bin 0 < ../../examples/webserver/httpd-cfs/backgrnd.gif
java -jar $(AC) -p $@ contiki.gif bin 0 < ../../examples/webserver/httpd-cfs/contiki.gif
java -jar $(AC) -p $@ notfound.htm bin 0 < ../../examples/webserver/httpd-cfs/notfound.htm
java -jar $(AC) -p $@ index.htm bin 0 < ../../examples/webserver/httpd-cfs/index.htm
java -jar $(AC) -p $@ backgrnd.gif bin 0 < ../../examples/webserver/httpd-cfs/backgrnd.gif
java -jar $(AC) -p $@ contiki.gif bin 0 < ../../examples/webserver/httpd-cfs/contiki.gif
java -jar $(AC) -p $@ notfound.htm bin 0 < ../../examples/webserver/httpd-cfs/notfound.htm
contiki-apple2.po: apple2enh-makes
cp ../apple2enh/prodos.po $@
java -jar $(AC) -p $@ menu.system sys < ../apple2enh/menu.system
java -jar $(AC) -p $@ $(DEV)confi.system sys < $(CC65)/apple2enh/util/loader.system
java -jar $(AC) -cc65 $@ $(DEV)confi bin < ../../cpu/6502/$(DEV)config/$(DEV)config.apple2enh
java -jar $(AC) -p $@ ipconfig.system sys < $(CC65)/apple2enh/util/loader.system
java -jar $(AC) -cc65 $@ ipconfig bin < ../../cpu/6502/ipconfig/ipconfig.apple2enh
java -jar $(AC) -p $@ webbrows.system sys < $(CC65)/apple2enh/util/loader.system
java -jar $(AC) -cc65 $@ webbrows bin < ../../examples/webbrowser-80col/webbrowser.apple2enh
java -jar $(AC) -p $@ wget.system sys < $(CC65)/apple2enh/util/loader.system
java -jar $(AC) -cc65 $@ wget bin < ../../examples/wget/wget.apple2enh
java -jar $(AC) -p $@ irc.system sys < $(CC65)/apple2enh/util/loader.system
java -jar $(AC) -cc65 $@ irc bin < ../../examples/irc-80col/irc-client.apple2enh
java -jar $(AC) -p $@ webserv.system sys < $(CC65)/apple2enh/util/loader.system
java -jar $(AC) -cc65 $@ webserv bin < ../../examples/webserver/webserver-example.apple2enh
java -jar $(AC) -p $@ telnetd.system sys < $(CC65)/apple2enh/util/loader.system
java -jar $(AC) -cc65 $@ telnetd bin < ../../examples/telnet-server/telnet-server.apple2enh
java -jar $(AC) -p $@ menu.system sys < ../apple2enh/menu.system
java -jar $(AC) -p $@ $(DEV)confi.system sys < $(CC65)/apple2enh/util/loader.system
java -jar $(AC) -as $@ $(DEV)confi < ../../cpu/6502/$(DEV)config/$(DEV)config.apple2enh
java -jar $(AC) -p $@ ipconfig.system sys < $(CC65)/apple2enh/util/loader.system
java -jar $(AC) -as $@ ipconfig < ../../cpu/6502/ipconfig/ipconfig.apple2enh
java -jar $(AC) -p $@ webbrows.system sys < $(CC65)/apple2enh/util/loader.system
java -jar $(AC) -as $@ webbrows < ../../examples/webbrowser-80col/webbrowser.apple2enh
java -jar $(AC) -p $@ wget.system sys < $(CC65)/apple2enh/util/loader.system
java -jar $(AC) -as $@ wget < ../../examples/wget/wget.apple2enh
java -jar $(AC) -p $@ irc.system sys < $(CC65)/apple2enh/util/loader.system
java -jar $(AC) -as $@ irc < ../../examples/irc-80col/irc-client.apple2enh
java -jar $(AC) -p $@ webserv.system sys < $(CC65)/apple2enh/util/loader.system
java -jar $(AC) -as $@ webserv < ../../examples/webserver/webserver-example.apple2enh
java -jar $(AC) -p $@ telnetd.system sys < $(CC65)/apple2enh/util/loader.system
java -jar $(AC) -as $@ telnetd < ../../examples/telnet-server/telnet-server.apple2enh
ifdef SLIP
java -jar $(AC) -p $@ contiki.cfg bin 0 < default.cfg
java -jar $(AC) -p $@ contiki.cfg bin 0 < default.cfg
else
java -jar $(AC) -p $@ contiki.cfg bin 0 < ../apple2enh/default.cfg
java -jar $(AC) -p $@ cs8900a.eth rel 0 < ../../cpu/6502/ethconfig/cs8900a.eth
java -jar $(AC) -p $@ lan91c96.eth rel 0 < ../../cpu/6502/ethconfig/lan91c96.eth
java -jar $(AC) -p $@ w5100.eth rel 0 < ../../cpu/6502/ethconfig/w5100.eth
java -jar $(AC) -p $@ contiki.cfg bin 0 < ../apple2enh/default.cfg
java -jar $(AC) -p $@ cs8900a.eth rel 0 < ../../cpu/6502/ethconfig/cs8900a.eth
java -jar $(AC) -p $@ lan91c96.eth rel 0 < ../../cpu/6502/ethconfig/lan91c96.eth
java -jar $(AC) -p $@ w5100.eth rel 0 < ../../cpu/6502/ethconfig/w5100.eth
endif
java -jar $(AC) -p $@ contiki.mou rel 0 < $(CC65)/apple2enh/drv/mou/a2e.stdmou.mou
java -jar $(AC) -p $@ index.htm bin 0 < ../../examples/webserver/httpd-cfs/index.htm
java -jar $(AC) -p $@ backgrnd.gif bin 0 < ../../examples/webserver/httpd-cfs/backgrnd.gif
java -jar $(AC) -p $@ contiki.gif bin 0 < ../../examples/webserver/httpd-cfs/contiki.gif
java -jar $(AC) -p $@ notfound.htm bin 0 < ../../examples/webserver/httpd-cfs/notfound.htm
java -jar $(AC) -p $@ contiki.mou rel 0 < $(CC65)/apple2enh/drv/mou/a2e.stdmou.mou
java -jar $(AC) -p $@ index.htm bin 0 < ../../examples/webserver/httpd-cfs/index.htm
java -jar $(AC) -p $@ backgrnd.gif bin 0 < ../../examples/webserver/httpd-cfs/backgrnd.gif
java -jar $(AC) -p $@ contiki.gif bin 0 < ../../examples/webserver/httpd-cfs/contiki.gif
java -jar $(AC) -p $@ notfound.htm bin 0 < ../../examples/webserver/httpd-cfs/notfound.htm
$(eval $(call makes,atarixl))
$(eval $(call makes,atarixl,clean))