Move the fluxtovcd file into the main client.

.appveyor.yml

@@ -15,7 +15,7 @@ install:
 
 build_script:
   - make
-  - zip -9 fluxengine.zip fluxengine.exe brother120tool.exe fluxtovcd.exe fluxtoau.exe
+  - zip -9 fluxengine.zip fluxengine.exe brother120tool.exe fluxtoau.exe
 
 artifacts:
   - path: fluxengine.zip

mkninja.sh

@@ -179,8 +179,9 @@ buildlibrary libbackend.a \
     lib/zilogmcz/decoder.cc \
 
 buildlibrary libfrontend.a \
-    src/fe-erase.cc \
     src/fe-cwftoflux.cc \
+    src/fe-erase.cc \
+    src/fe-fluxtovcd.cc \
     src/fe-inspect.cc \
     src/fe-readadfs.cc \
     src/fe-readaeslanier.cc \
@@ -221,11 +222,6 @@ buildsimpleprogram brother120tool \
     libemu.a \
     libfmt.a \
 
-buildsimpleprogram fluxtovcd \
-    tools/fluxtovcd.cc \
-    libbackend.a \
-    libfmt.a \
-
 buildsimpleprogram fluxtoau \
     tools/fluxtoau.cc \
     libbackend.a \

src/fe-fluxtovcd.cc

@@ -26,7 +26,7 @@ static SettableFlag highDensityFlag(
     { "--high-density", "--hd" },
     "set the drive to high density mode");
 
-int main(int argc, const char* argv[])
+int mainConvertFluxToVcd(int argc, const char* argv[])
 {
     flags.parseFlags(argc, argv);
 

src/fluxengine.cc

@@ -4,6 +4,7 @@ typedef int command_cb(int agrc, const char* argv[]);
 
 extern command_cb mainErase;
 extern command_cb mainConvertCwfToFlux;
+extern command_cb mainConvertFluxToVcd;
 extern command_cb mainInspect;
 extern command_cb mainReadADFS;
 extern command_cb mainReadAESLanier;
@@ -81,6 +82,7 @@ static std::vector<Command> writeables =
 static std::vector<Command> convertables =
 {
     { "cwftoflux",     mainConvertCwfToFlux, "Converts CatWeasel stream files to flux.", },
+    { "fluxtovcd",     mainConvertFluxToVcd, "Converts (one track of a) flux file to a VCD file.", },
 };
 
 static void extendedHelp(std::vector<Command>& subcommands, const std::string& command)