First steps towards reworking the build system... again.

2025-10-31 11:17:01 -07:00 · 2023-10-21 23:02:46 +02:00
parent bbdfa0d651
commit f5f223f622
175 changed files with 2159 additions and 1068 deletions
--- a/lib/imagereader/d64imagereader.cc
+++ b/lib/imagereader/d64imagereader.cc
@@ -1,10 +1,10 @@
-#include "globals.h"
-#include "flags.h"
-#include "sector.h"
-#include "imagereader/imagereader.h"
-#include "image.h"
-#include "logger.h"
-#include "proto.h"
+#include "lib/globals.h"
+#include "lib/flags.h"
+#include "lib/sector.h"
+#include "lib/imagereader/imagereader.h"
+#include "lib/image.h"
+#include "lib/logger.h"
+#include "lib/proto.h"
 #include <algorithm>
 #include <iostream>
 #include <fstream>
--- a/lib/imagereader/d88imagereader.cc
+++ b/lib/imagereader/d88imagereader.cc
@@ -1,10 +1,10 @@
-#include "globals.h"
-#include "flags.h"
-#include "sector.h"
-#include "imagereader/imagereader.h"
-#include "image.h"
-#include "proto.h"
-#include "logger.h"
+#include "lib/globals.h"
+#include "lib/flags.h"
+#include "lib/sector.h"
+#include "lib/imagereader/imagereader.h"
+#include "lib/image.h"
+#include "lib/proto.h"
+#include "lib/logger.h"
 #include "lib/config.pb.h"
 #include <algorithm>
 #include <iostream>
--- a/lib/imagereader/dimimagereader.cc
+++ b/lib/imagereader/dimimagereader.cc
@@ -1,10 +1,10 @@
-#include "globals.h"
-#include "flags.h"
-#include "sector.h"
-#include "imagereader/imagereader.h"
-#include "image.h"
-#include "logger.h"
-#include "proto.h"
+#include "lib/globals.h"
+#include "lib/flags.h"
+#include "lib/sector.h"
+#include "lib/imagereader/imagereader.h"
+#include "lib/image.h"
+#include "lib/logger.h"
+#include "lib/proto.h"
 #include "lib/config.pb.h"
 #include <algorithm>
 #include <iostream>
--- a/lib/imagereader/diskcopyimagereader.cc
+++ b/lib/imagereader/diskcopyimagereader.cc
@@ -1,9 +1,9 @@
-#include "globals.h"
-#include "flags.h"
-#include "sector.h"
-#include "imagereader/imagereader.h"
-#include "image.h"
-#include "logger.h"
+#include "lib/globals.h"
+#include "lib/flags.h"
+#include "lib/sector.h"
+#include "lib/imagereader/imagereader.h"
+#include "lib/image.h"
+#include "lib/logger.h"
 #include "lib/config.pb.h"
 #include <algorithm>
 #include <iostream>
--- a/lib/imagereader/fdiimagereader.cc
+++ b/lib/imagereader/fdiimagereader.cc
@@ -1,10 +1,10 @@
-#include "globals.h"
-#include "flags.h"
-#include "sector.h"
-#include "imagereader/imagereader.h"
-#include "image.h"
-#include "proto.h"
-#include "logger.h"
+#include "lib/globals.h"
+#include "lib/flags.h"
+#include "lib/sector.h"
+#include "lib/imagereader/imagereader.h"
+#include "lib/image.h"
+#include "lib/proto.h"
+#include "lib/logger.h"
 #include "lib/config.pb.h"
 #include <algorithm>
 #include <iostream>
--- a/lib/imagereader/imagereader.cc
+++ b/lib/imagereader/imagereader.cc
@@ -1,10 +1,10 @@
-#include "globals.h"
-#include "flags.h"
-#include "sector.h"
-#include "imagereader/imagereader.h"
-#include "utils.h"
-#include "proto.h"
-#include "image.h"
+#include "lib/globals.h"
+#include "lib/flags.h"
+#include "lib/sector.h"
+#include "lib/imagereader/imagereader.h"
+#include "lib/utils.h"
+#include "lib/proto.h"
+#include "lib/image.h"
 #include "lib/layout.h"
 #include "lib/config.pb.h"
 #include "lib/logger.h"
--- a/lib/imagereader/imagereader.h
+++ b/lib/imagereader/imagereader.h
@@ -1,7 +1,7 @@
 #ifndef IMAGEREADER_H
 #define IMAGEREADER_H

-#include "image.h"
+#include "lib/image.h"
 #include "lib/config.pb.h"

 class ImageSpec;
--- a/lib/imagereader/imdimagereader.cc
+++ b/lib/imagereader/imdimagereader.cc
@@ -1,11 +1,11 @@
-#include "globals.h"
-#include "flags.h"
-#include "sector.h"
-#include "imagereader/imagereader.h"
-#include "image.h"
-#include "proto.h"
-#include "logger.h"
-#include "layout.h"
+#include "lib/globals.h"
+#include "lib/flags.h"
+#include "lib/sector.h"
+#include "lib/imagereader/imagereader.h"
+#include "lib/image.h"
+#include "lib/proto.h"
+#include "lib/logger.h"
+#include "lib/layout.h"
 #include "lib/config.pb.h"
 #include <algorithm>
 #include <iostream>
--- a/lib/imagereader/imgimagereader.cc
+++ b/lib/imagereader/imgimagereader.cc
@@ -1,9 +1,9 @@
-#include "globals.h"
-#include "flags.h"
-#include "sector.h"
-#include "imagereader/imagereader.h"
-#include "image.h"
-#include "logger.h"
+#include "lib/globals.h"
+#include "lib/flags.h"
+#include "lib/sector.h"
+#include "lib/imagereader/imagereader.h"
+#include "lib/image.h"
+#include "lib/logger.h"
 #include "lib/config.pb.h"
 #include "lib/layout.pb.h"
 #include "lib/proto.h"
--- a/lib/imagereader/jv3imagereader.cc
+++ b/lib/imagereader/jv3imagereader.cc
@@ -1,9 +1,9 @@
-#include "globals.h"
-#include "flags.h"
-#include "sector.h"
-#include "imagereader/imagereader.h"
-#include "image.h"
-#include "logger.h"
+#include "lib/globals.h"
+#include "lib/flags.h"
+#include "lib/sector.h"
+#include "lib/imagereader/imagereader.h"
+#include "lib/image.h"
+#include "lib/logger.h"
 #include "lib/config.pb.h"
 #include <algorithm>
 #include <iostream>
--- a/lib/imagereader/nfdimagereader.cc
+++ b/lib/imagereader/nfdimagereader.cc
@@ -1,10 +1,10 @@
-#include "globals.h"
-#include "flags.h"
-#include "sector.h"
-#include "imagereader/imagereader.h"
-#include "image.h"
-#include "proto.h"
-#include "logger.h"
+#include "lib/globals.h"
+#include "lib/flags.h"
+#include "lib/sector.h"
+#include "lib/imagereader/imagereader.h"
+#include "lib/image.h"
+#include "lib/proto.h"
+#include "lib/logger.h"
 #include "lib/config.pb.h"
 #include <algorithm>
 #include <iostream>
--- a/lib/imagereader/nsiimagereader.cc
+++ b/lib/imagereader/nsiimagereader.cc
@@ -1,11 +1,11 @@
 /* Image reader for Northstar floppy disk images */

-#include "globals.h"
-#include "flags.h"
-#include "sector.h"
-#include "imagereader/imagereader.h"
-#include "image.h"
-#include "logger.h"
+#include "lib/globals.h"
+#include "lib/flags.h"
+#include "lib/sector.h"
+#include "lib/imagereader/imagereader.h"
+#include "lib/image.h"
+#include "lib/logger.h"
 #include "lib/imagereader/imagereader.pb.h"
 #include <algorithm>
 #include <iostream>
--- a/lib/imagereader/td0imagereader.cc
+++ b/lib/imagereader/td0imagereader.cc
@@ -1,10 +1,10 @@
-#include "globals.h"
-#include "flags.h"
-#include "sector.h"
-#include "imagereader/imagereader.h"
-#include "image.h"
-#include "crc.h"
-#include "logger.h"
+#include "lib/globals.h"
+#include "lib/flags.h"
+#include "lib/sector.h"
+#include "lib/imagereader/imagereader.h"
+#include "lib/image.h"
+#include "lib/crc.h"
+#include "lib/logger.h"
 #include "lib/config.pb.h"
 #include <algorithm>
 #include <iostream>