Disable header maps in Xcode 12

src/pcedit/pc.action.cpp

@@ -2,15 +2,15 @@
 #include <cstdio>
 
 #include "pc.graphics.hpp"
-#include "universe.hpp"
+#include "universe/universe.hpp"
 #include "pc.editors.hpp"
 #include "pc.fileio.hpp"
 #include "pc.action.hpp"
 #include "sounds.hpp"
 #include "mathutil.hpp"
-#include "dialog.hpp"
-#include "control.hpp"
-#include "cursors.hpp"
+#include "dialogxml/dialogs/dialog.hpp"
+#include "dialogxml/widgets/control.hpp"
+#include "tools/cursors.hpp"
 #include <boost/lexical_cast.hpp>
 
 extern cUniverse univ;

src/pcedit/pc.action.hpp

@@ -1,6 +1,6 @@
 
 #include <SFML/Window/Event.hpp>
-#include "dialog.hpp"
+#include "dialogxml/dialogs/dialog.hpp"
 
 bool handle_action(const sf::Event&);
 void flash_rect(rectangle to_flash);

src/pcedit/pc.appleevents.mm

@@ -6,10 +6,10 @@
 //
 //
 
-#include "universe.hpp" // Include before Cocoa because the Cocoa header defines things that cause compilation errors in here
+#include "universe/universe.hpp" // Include before Cocoa because the Cocoa header defines things that cause compilation errors in here
 #include <Cocoa/Cocoa.h>
 #include <string>
-#include "fileio.hpp"
+#include "fileio/fileio.hpp"
 #include "pc.menus.hpp"
 #include "pc.fileio.hpp"
 

src/pcedit/pc.editors.cpp

@@ -1,18 +1,18 @@
 
 #include "pc.graphics.hpp"
-#include "universe.hpp"
+#include "universe/universe.hpp"
 #include "pc.editors.hpp"
 #include "utility.hpp"
-#include "dialog.hpp"
-#include "control.hpp"
-#include "button.hpp"
-#include "ledgroup.hpp"
-#include "pict.hpp"
-#include "strdlog.hpp"
-#include "choicedlog.hpp"
-#include "winutil.hpp"
-#include "cursors.hpp"
-#include "render_shapes.hpp" // for colour constants
+#include "dialogxml/dialogs/dialog.hpp"
+#include "dialogxml/widgets/control.hpp"
+#include "dialogxml/widgets/button.hpp"
+#include "dialogxml/widgets/ledgroup.hpp"
+#include "dialogxml/widgets/pict.hpp"
+#include "dialogxml/dialogs/strdlog.hpp"
+#include "dialogxml/dialogs/choicedlog.hpp"
+#include "tools/winutil.hpp"
+#include "tools/cursors.hpp"
+#include "gfx/render_shapes.hpp" // for colour constants
 #include <boost/lexical_cast.hpp>
 
 /*

src/pcedit/pc.fileio.cpp

@@ -2,13 +2,13 @@
 #include <cstring>
 #include <cstdio>
 
-#include "universe.hpp"
+#include "universe/universe.hpp"
 #include "pc.fileio.hpp"
 #include "pc.graphics.hpp"
 #include "sounds.hpp"
 #include "pc.editors.hpp"
 #include "mathutil.hpp"
-#include "fileio.hpp"
+#include "fileio/fileio.hpp"
 
 extern cUniverse univ;
 extern bool party_in_scen,scen_items_loaded;

src/pcedit/pc.graphics.cpp

@@ -1,19 +1,19 @@
 
 #include <iomanip>
-#include "universe.hpp"
+#include "universe/universe.hpp"
 #include "pc.graphics.hpp"
 #include "pc.editors.hpp"
 #include "pc.action.hpp"
 #include "pc.menus.hpp"
 #include "sounds.hpp"
-#include "gfxsheets.hpp"
-#include "render_shapes.hpp"
-#include "render_image.hpp"
-#include "res_image.hpp"
-#include "message.hpp"
+#include "gfx/gfxsheets.hpp"
+#include "gfx/render_shapes.hpp"
+#include "gfx/render_image.hpp"
+#include "fileio/resmgr/res_image.hpp"
+#include "dialogxml/widgets/message.hpp"
 #include "mathutil.hpp"
-#include "gitrev.hpp"
-#include "tiling.hpp" // for bg
+#include "tools/gitrev.hpp"
+#include "gfx/tiling.hpp" // for bg
 #include "utility.hpp"
 
 extern cUniverse univ;

src/pcedit/pc.main.cpp

@@ -2,27 +2,27 @@
 #include <iostream>
 #include <cstring>
 #include <boost/filesystem/operations.hpp>
-#include "universe.hpp"
+#include "universe/universe.hpp"
 #include "pc.graphics.hpp"
 #include "pc.editors.hpp"
 #include "pc.action.hpp"
 #include "pc.fileio.hpp"
 #include "sounds.hpp"
-#include "render_image.hpp"
-#include "tiling.hpp"
+#include "gfx/render_image.hpp"
+#include "gfx/tiling.hpp"
 #include "utility.hpp"
-#include "dialog.hpp"
-#include "control.hpp"
-#include "strdlog.hpp"
-#include "choicedlog.hpp"
-#include "strchoice.hpp"
-#include "fileio.hpp"
+#include "dialogxml/dialogs/dialog.hpp"
+#include "dialogxml/widgets/control.hpp"
+#include "dialogxml/dialogs/strdlog.hpp"
+#include "dialogxml/dialogs/choicedlog.hpp"
+#include "dialogxml/dialogs/strchoice.hpp"
+#include "fileio/fileio.hpp"
 #include "pc.menus.hpp"
-#include "winutil.hpp"
-#include "cursors.hpp"
-#include "res_image.hpp"
-#include "prefs.hpp"
-#include "framerate_limiter.hpp"
+#include "tools/winutil.hpp"
+#include "tools/cursors.hpp"
+#include "fileio/resmgr/res_image.hpp"
+#include "tools/prefs.hpp"
+#include "tools/framerate_limiter.hpp"
 
 cUniverse univ;
 

src/pcedit/pc.menus.mac.mm

@@ -7,9 +7,9 @@
 //
 
 #include "pc.menus.hpp"
-#include "universe.hpp" // Include before Cocoa because the Cocoa header defines things that cause compilation errors in here
+#include "universe/universe.hpp" // Include before Cocoa because the Cocoa header defines things that cause compilation errors in here
 #include <Cocoa/Cocoa.h>
-#include "item.hpp"
+#include "scenario/item.hpp"
 
 #ifndef __APPLE__
 #error pc.menus.mm is Mac-specific code; try compiling pc.menus.win.cpp instead