Added FTP client, text editor, CTK drivers
diff --git a/contiki-c64/Makefile.programs b/contiki-c64/Makefile.programs
index 662dced..76f2a00 100644
--- a/contiki-c64/Makefile.programs
+++ b/contiki-c64/Makefile.programs
@@ -9,10 +9,7 @@
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-# must display the following acknowledgement:
-# This product includes software developed by Adam Dunkels.
-# 4. The name of the author may not be used to endorse or promote
+# 3. The name of the author may not be used to endorse or promote
# products derived from this software without specific prior
# written permission.
#
@@ -30,7 +27,7 @@
#
# This file is part of the Contiki desktop environment
#
-# $Id: Makefile.programs,v 1.21 2004/07/04 18:33:07 adamdunkels Exp $
+# $Id: Makefile.programs,v 1.22 2004/08/09 21:44:28 adamdunkels Exp $
#
all: loader-arch-module.o loader-arch-dsc.o contiki-labels.o \
@@ -43,11 +40,6 @@
webserver.prg webserver.dsc \
wget.prg wget.dsc \
directory.prg directory.dsc \
- blueround.prg blueround.dsc \
- enabler.prg enabler.dsc \
- springlight.prg springlight.dsc \
- default.prg default.dsc \
- ravenpine.prg ravenpine.dsc \
ssfire.sav ssfire.dsc \
plasma.sav plasma.dsc \
rrnet.drv rrnet.dsc \
@@ -56,9 +48,18 @@
config.prg configedit.prg configedit.dsc \
shell.prg shell.dsc \
telnetd.prg telnetd.dsc \
+ ftp.prg ftp.dsc \
+ editor.prg editor.dsc \
+ cfs-cbm.drv \
email.prg \
vnc.prg \
- mtest.prg
+ ctk-text.drv ctk-default.drv ctk-80col.drv \
+# mtest.prg warmboot.prg lc-test
+# blueround.prg blueround.dsc \
+# enabler.prg enabler.dsc \
+# springlight.prg springlight.dsc \
+# default.prg default.dsc \
+# ravenpine.prg ravenpine.dsc \
# slip.drv slip.dsc \
# slip-ss.drv \
# calc.prg \
@@ -79,13 +80,13 @@
telnetd.prg: telnetd.o shell.o memb.o telnetd-gui.o
-configedit.prg: configedit.o c64-fs-write.o
+configedit.prg: configedit.o #c64-fs-write.o
email.prg: $(EMAIL)
www.prg: $(WWW)
-webserver.prg: $(WEBSERVER) c64-fs-raw.o
+webserver.prg: $(WEBSERVER) #c64-fs-raw.o
simpletelnet.prg: $(TELNET)
@@ -101,11 +102,29 @@
cl65 --module -t $(SYS) -o $@ loader-arch-module.o $^
-wget.prg: wget.o webclient.o http-strings.o http-user-agent-string.o
+wget.prg: wget.o webclient.o http-strings.o http-user-agent-string.o c64-dio.o c64-dio-asm.o
+
+ftp.prg: ftp.o ftpc.o memb.o
+
+ftp.dsc: ftp-dsc.o
+
+editor.prg: editor.o memb.o ctk-filedialog.o
VNC=vnc.o vnc-viewer.o vnc-draw.o vnc-draw-asm.o
vnc.prg: $(VNC)
+ctk-vnc.drv: ctk-vncserver-service.o libconio.o vnc-server.o vnc-out.o ctk-vncfont.o contiki-labels.o
+ cl65 --module -t c64 -o $@ loader-arch-module.o $^
+
+ctk-text.drv: ctk-conio-service.o contiki-labels.o
+ cl65 --module -t c64 -o $@ loader-arch-module.o $^
+
+ctk-80col.drv: ctk-conio-service.o ctk-80col-libconio.o ctk-80col.o ctk-80col-asm.o contiki-labels.o
+ cl65 --module -t c64 -o $@ loader-arch-module.o $^
+
+ctk-default.drv: ctk-hires-service.o ctk-hires-asm.o ctk-hires-theme-default.o contiki-labels.o
+ cl65 --module -t c64 -o $@ loader-arch-module.o $^
+
blueround.prg: themeloader.o ctk-hires-theme-blueround.o contiki-labels.o
cl65 --module -t c64 -o $@ loader-arch-module.o $^
@@ -124,4 +143,7 @@
memstat.prg: memstat.o
-mtest.prg: mtest.o mtp.o mt.o mtarch.o mtarch-asm.o
\ No newline at end of file
+mtest.prg: mtest.o mtp.o mt.o mtarch.o mtarch-asm.o
+
+lc-test: lc-test.o lc-asm.o
+ cl65 -o lc-test -t c64 $^
\ No newline at end of file