diff --git a/TODO-PROJECT b/TODO-PROJECT
index 660fdc5c..e62bc0de 100644
--- a/TODO-PROJECT
+++ b/TODO-PROJECT
@@ -17,8 +17,6 @@ Windows build - zeromus
* verify debugging
* verify avi writing
-Investigate OSX build [ http://www.lamer0.com/ ] - zeromus
-
Commandline parsing - lukas
* verify in windows - zeromus
@@ -42,6 +40,8 @@ Netplay - FUTURE STUFF
verify netplay
----done-----
+
+Investigate OSX build [ http://www.lamer0.com/ ] - zeromus [posted on blog...]
Move to scons - DONE
@@ -51,6 +51,10 @@ Merge garnet and sf repos - DONE
--strategic--
+Politics:
+ * aboutbox credits
+ * AUTHORS
+
Release:
* Press Release - ??
* Homepage updates
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index 168d63e6..00000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-AUTOMAKE_OPTIONS = subdir-objects
-
-bin_PROGRAMS = fceu
-fceu_SOURCES = cart.cpp cheat.cpp crc32.cpp config.cpp debug.cpp endian.cpp fceu.cpp fds.cpp file.cpp filter.cpp general.cpp ines.cpp input.cpp md5.cpp memory.cpp netplay.cpp nsf.cpp palette.cpp ppu.cpp sound.cpp state.cpp unif.cpp video.cpp vsuni.cpp wave.cpp x6502.cpp movie.cpp unzip.cpp
-
-include $(srcdir)/boards/Makefile.am.inc
-include $(srcdir)/input/Makefile.am.inc
-include $(srcdir)/mappers/Makefile.am.inc
-include $(srcdir)/drivers/common/Makefile.am.inc
-include $(srcdir)/drivers/pc/Makefile.am.inc
-
-fceu_SOURCES += $(sexyal_SOURCES)
-fceu_SOURCES += $(fceud_SOURCES)
-
-DEFAULT_INCLUDES =
diff --git a/src/boards/Makefile.am.inc b/src/boards/Makefile.am.inc
deleted file mode 100644
index 1e7f044a..00000000
--- a/src/boards/Makefile.am.inc
+++ /dev/null
@@ -1,55 +0,0 @@
-fceu_SOURCES += boards/01-222.cpp
-fceu_SOURCES += boards/112.cpp
-fceu_SOURCES += boards/117.cpp
-fceu_SOURCES += boards/164.cpp
-fceu_SOURCES += boards/183.cpp
-fceu_SOURCES += boards/185.cpp
-fceu_SOURCES += boards/186.cpp
-fceu_SOURCES += boards/187.cpp
-fceu_SOURCES += boards/189.cpp
-fceu_SOURCES += boards/199.cpp
-fceu_SOURCES += boards/208.cpp
-fceu_SOURCES += boards/222.cpp
-fceu_SOURCES += boards/235.cpp
-fceu_SOURCES += boards/43.cpp
-fceu_SOURCES += boards/57.cpp
-fceu_SOURCES += boards/603-5052.cpp
-fceu_SOURCES += boards/8157.cpp
-fceu_SOURCES += boards/8237.cpp
-fceu_SOURCES += boards/88.cpp
-fceu_SOURCES += boards/90.cpp
-fceu_SOURCES += boards/95.cpp
-fceu_SOURCES += boards/__dummy_mapper.cpp
-fceu_SOURCES += boards/a9711.cpp
-fceu_SOURCES += boards/addrlatch.cpp
-fceu_SOURCES += boards/bmc13in1jy110.cpp
-fceu_SOURCES += boards/bmc42in1r.cpp
-fceu_SOURCES += boards/bmc64in1nr.cpp
-fceu_SOURCES += boards/bmc70in1.cpp
-fceu_SOURCES += boards/bonza.cpp
-fceu_SOURCES += boards/datalatch.cpp
-fceu_SOURCES += boards/deirom.cpp
-fceu_SOURCES += boards/dream.cpp
-fceu_SOURCES += boards/edu2000.cpp
-fceu_SOURCES += boards/fk23c.cpp
-fceu_SOURCES += boards/h2288.cpp
-fceu_SOURCES += boards/karaoke.cpp
-fceu_SOURCES += boards/kof97.cpp
-fceu_SOURCES += boards/konami-qtai.cpp
-fceu_SOURCES += boards/malee.cpp
-fceu_SOURCES += boards/mapinc.h"
-fceu_SOURCES += boards/mmc1.cpp
-fceu_SOURCES += boards/mmc3.cpp
-fceu_SOURCES += boards/mmc3.h"
-fceu_SOURCES += boards/mmc5.cpp
-fceu_SOURCES += boards/n-c22m.cpp
-fceu_SOURCES += boards/n106.cpp
-fceu_SOURCES += boards/novel.cpp
-fceu_SOURCES += boards/sachen.cpp
-fceu_SOURCES += boards/sheroes.cpp
-fceu_SOURCES += boards/sl1632.cpp
-fceu_SOURCES += boards/subor.cpp
-fceu_SOURCES += boards/super24.cpp
-fceu_SOURCES += boards/supervision.cpp
-fceu_SOURCES += boards/t-262.cpp
-fceu_SOURCES += boards/tengen.cpp
diff --git a/src/input/Makefile.am.inc b/src/input/Makefile.am.inc
deleted file mode 100755
index 761ea208..00000000
--- a/src/input/Makefile.am.inc
+++ /dev/null
@@ -1 +0,0 @@
-fceu_SOURCES += input/cursor.cpp input/zapper.cpp input/powerpad.cpp input/arkanoid.cpp input/shadow.cpp input/fkb.cpp input/fkb.h input/hypershot.cpp input/mahjong.cpp input/oekakids.cpp input/ftrainer.cpp input/quiz.cpp input/toprider.cpp input/bworld.cpp input/suborkb.cpp
diff --git a/src/mappers/Makefile.am.inc b/src/mappers/Makefile.am.inc
deleted file mode 100644
index 6f27988a..00000000
--- a/src/mappers/Makefile.am.inc
+++ /dev/null
@@ -1,79 +0,0 @@
-fceu_SOURCES += mappers/emu2413.c
-
-fceu_SOURCES += mappers/15.cpp
-fceu_SOURCES += mappers/151.cpp
-fceu_SOURCES += mappers/16.cpp
-fceu_SOURCES += mappers/17.cpp
-fceu_SOURCES += mappers/18.cpp
-fceu_SOURCES += mappers/193.cpp
-fceu_SOURCES += mappers/200.cpp
-fceu_SOURCES += mappers/201.cpp
-fceu_SOURCES += mappers/202.cpp
-fceu_SOURCES += mappers/203.cpp
-fceu_SOURCES += mappers/204.cpp
-fceu_SOURCES += mappers/21.cpp
-fceu_SOURCES += mappers/212.cpp
-fceu_SOURCES += mappers/213.cpp
-fceu_SOURCES += mappers/214.cpp
-fceu_SOURCES += mappers/215.cpp
-fceu_SOURCES += mappers/217.cpp
-fceu_SOURCES += mappers/22.cpp
-fceu_SOURCES += mappers/225.cpp
-fceu_SOURCES += mappers/227.cpp
-fceu_SOURCES += mappers/228.cpp
-fceu_SOURCES += mappers/229.cpp
-fceu_SOURCES += mappers/23.cpp
-fceu_SOURCES += mappers/230.cpp
-fceu_SOURCES += mappers/231.cpp
-fceu_SOURCES += mappers/232.cpp
-fceu_SOURCES += mappers/234.cpp
-fceu_SOURCES += mappers/240.cpp
-fceu_SOURCES += mappers/241.cpp
-fceu_SOURCES += mappers/242.cpp
-fceu_SOURCES += mappers/244.cpp
-fceu_SOURCES += mappers/246.cpp
-fceu_SOURCES += mappers/24and26.cpp
-fceu_SOURCES += mappers/25.cpp
-fceu_SOURCES += mappers/255.cpp
-fceu_SOURCES += mappers/27.cpp
-fceu_SOURCES += mappers/32.cpp
-fceu_SOURCES += mappers/33.cpp
-fceu_SOURCES += mappers/40.cpp
-fceu_SOURCES += mappers/41.cpp
-fceu_SOURCES += mappers/42.cpp
-fceu_SOURCES += mappers/43.cpp
-fceu_SOURCES += mappers/46.cpp
-fceu_SOURCES += mappers/50.cpp
-fceu_SOURCES += mappers/51.cpp
-fceu_SOURCES += mappers/59.cpp
-fceu_SOURCES += mappers/6.cpp
-fceu_SOURCES += mappers/60.cpp
-fceu_SOURCES += mappers/61.cpp
-fceu_SOURCES += mappers/62.cpp
-fceu_SOURCES += mappers/65.cpp
-fceu_SOURCES += mappers/67.cpp
-fceu_SOURCES += mappers/68.cpp
-fceu_SOURCES += mappers/69.cpp
-fceu_SOURCES += mappers/71.cpp
-fceu_SOURCES += mappers/72.cpp
-fceu_SOURCES += mappers/73.cpp
-fceu_SOURCES += mappers/75.cpp
-fceu_SOURCES += mappers/76.cpp
-fceu_SOURCES += mappers/77.cpp
-fceu_SOURCES += mappers/79.cpp
-fceu_SOURCES += mappers/8.cpp
-fceu_SOURCES += mappers/80.cpp
-fceu_SOURCES += mappers/82.cpp
-fceu_SOURCES += mappers/83.cpp
-fceu_SOURCES += mappers/85.cpp
-fceu_SOURCES += mappers/86.cpp
-fceu_SOURCES += mappers/89.cpp
-fceu_SOURCES += mappers/91.cpp
-fceu_SOURCES += mappers/92.cpp
-fceu_SOURCES += mappers/97.cpp
-fceu_SOURCES += mappers/99.cpp
-fceu_SOURCES += mappers/__226.cpp
-fceu_SOURCES += mappers/mmc2and4.cpp
-fceu_SOURCES += mappers/simple.cpp
-
-
diff --git a/vc7/fceu.sln b/vc7/fceu.sln
new file mode 100644
index 00000000..c6719a78
--- /dev/null
+++ b/vc7/fceu.sln
@@ -0,0 +1,21 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fceu", "fceu.vcproj", "{BFC68F65-06E2-45FF-B793-921BA3CC046C}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Global
+ GlobalSection(SolutionConfiguration) = preSolution
+ Debug = Debug
+ Release = Release
+ EndGlobalSection
+ GlobalSection(ProjectConfiguration) = postSolution
+ {BFC68F65-06E2-45FF-B793-921BA3CC046C}.Debug.ActiveCfg = Debug|Win32
+ {BFC68F65-06E2-45FF-B793-921BA3CC046C}.Debug.Build.0 = Debug|Win32
+ {BFC68F65-06E2-45FF-B793-921BA3CC046C}.Release.ActiveCfg = Release|Win32
+ {BFC68F65-06E2-45FF-B793-921BA3CC046C}.Release.Build.0 = Release|Win32
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ EndGlobalSection
+ GlobalSection(ExtensibilityAddIns) = postSolution
+ EndGlobalSection
+EndGlobal
diff --git a/vc7/fceu.vcproj b/vc7/fceu.vcproj
new file mode 100644
index 00000000..3ce2687e
--- /dev/null
+++ b/vc7/fceu.vcproj
@@ -0,0 +1,1075 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/vc8/fceux.vcproj b/vc8/fceux.vcproj
index 9f7e9525..7aa53111 100644
--- a/vc8/fceux.vcproj
+++ b/vc8/fceux.vcproj
@@ -353,26 +353,1194 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+