From 85b224155594c1172ff24ebbd286b5d2e99df0b7 Mon Sep 17 00:00:00 2001
From: Steven Hugg <hugg@fasterlight.com>
Date: Tue, 27 Nov 2018 17:37:45 -0500
Subject: [PATCH] added Makefile back to tools; vcs.mame

---
 css/ui.css     |  2 +-
 doc/notes.txt  |  2 ++
 index.html     |  2 +-
 tools/Makefile | 53 +++++++++++++++++++++++++++++++++++++++-----------
 4 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/css/ui.css b/css/ui.css
index a7c114d8..11b28929 100644
--- a/css/ui.css
+++ b/css/ui.css
@@ -239,7 +239,7 @@ div.emuspacer {
 .emuvideo {
   border-radius:20px;
   border: 4px solid #222;
-  outline-color: #666;
+  outline-color: #ccc;
   padding: 20px;
   background: #000;
   margin-top:40px;
diff --git a/doc/notes.txt b/doc/notes.txt
index 63e38da4..62795efe 100644
--- a/doc/notes.txt
+++ b/doc/notes.txt
@@ -82,6 +82,8 @@ TODO:
 - can't upload files already exist
 - upload files w/o new project
 - what if .c and .s names collide?
+- live coding URL
+- memory viewer: ROM/RAM/VRAM/etc
 
 
 WEB WORKER FORMAT
diff --git a/index.html b/index.html
index 5a3030f1..27712b3b 100644
--- a/index.html
+++ b/index.html
@@ -94,7 +94,7 @@ if (window.location.host.endsWith('8bitworkshop.com')) {
              <a tabindex="-1" href="#">Game Consoles</a>
              <ul class="dropdown-menu">
                <li><a class="dropdown-item" href="?platform=vcs" id="item_platform_vcs">Atari 2600/VCS</a></li>
-               <li><a class="dropdown-item" href="?platform=vcs-mame" id="item_platform_vcs">Atari 2600/VCS (MAME)</a></li>
+               <li><a class="dropdown-item" href="?platform=vcs.mame" id="item_platform_vcs">Atari 2600/VCS (MAME)</a></li>
              </ul>
           </li>
           <li class="dropdown dropdown-submenu">
diff --git a/tools/Makefile b/tools/Makefile
index cd516673..7c3f2d61 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,19 +1,50 @@
 
 all: binaries images/parrot.c
 
-%.hex: %
-	cat $< | hexdump -v -e '"\n.byte" 16/1 ",0x%02x"' | sed "s/byte,/byte /" > $@
-
-%.c: %.CHR.lzg.hex %.CLR.lzg.hex
-	echo "// MSX mode 2 data" > $@
-	xxd -i $(word 1,$^) >> $@
-	xxd -i $(word 2,$^) >> $@
-
 %.lzg: %
 	lzg -9 $< $@
 
-%.CHR: %.tga
-	./scr2floyd_percept $<
-
 binaries: scr2floyd scr2floyd_percept galois
 
+%-pf.hex: %-pf.pbm p4_to_pfbytes.py
+	python p4_to_pfbytes.py $< > $@
+
+%-48.hex: %-48.pbm p4_to_48pix.py
+	python p4_to_48pix.py $< > $@
+
+%-pf.pbm: %.jpg
+	convert $< -resize 40x192\! -colorspace Gray -dither FloydSteinberg $@
+
+%-48.pbm: %.jpg
+	convert $< -resize 48x192\! -colorspace Gray -dither FloydSteinberg $@
+
+%.tga: %.png
+	convert $< -resize 192 $<.gif
+	convert $<.gif +dither -type palette -depth 4 -compress RLE -colors 8 -flip $@
+	convert $@ $@.png
+
+%.pcx: %.png
+	convert $< -format raw -type palette -compress none -colors 15 +dither $@
+%.rle.pcx: %.png
+	convert $< -format raw -type palette -compress rle -colors 15 +dither $@
+%.4.pcx: %.png
+	convert $< -format raw -type palette -compress none -colors 4 +dither $@
+
+ship1.pbm: ship1.png
+	convert ship1.png -negate -flop ship1.pbm
+
+%.h:
+	cat $* | hexdump -v -e '"\n" 128/1 "0x%02x,"'
+
+%.prom:
+	cat $* | hexdump -v -e '" \n defb  " 32/1 "$$%02x,"' | cut -c 2-134
+
+%.rot.pbm: %.pbm
+	convert $< -transpose -bordercolor white -border 4x4 $@
+
+baddies-horiz.rot.pbm: baddies-horiz.png
+	convert $< +dither -brightness-contrast 50x50 -fill black -transpose -negate $@
+	convert $@ foo.png
+
+lfsr.out: lfsrcalc.py
+	pypy lfsrcalc.py | sort -n > lfsr.out