Codechange: no longer add "src" to the include-path (#13511)

CMakeLists.txt

@@ -231,8 +231,6 @@ endif()
 include(CTest)
 include(SourceList)
 
-# Needed by rev.cpp
-include_directories(${CMAKE_SOURCE_DIR}/src)
 # Needed by everything that uses Squirrel
 include_directories(${CMAKE_SOURCE_DIR}/src/3rdparty/squirrel/include)
 

src/game/game_text.cpp

@@ -19,7 +19,7 @@
 #include "game_info.hpp"
 
 #include "table/strings.h"
-#include "table/strgen_tables.h"
+#include "../table/strgen_tables.h"
 
 #include "../safeguards.h"
 

src/network/core/os_abstraction.cpp

@@ -16,7 +16,7 @@
  * that the behaviour is usually Unix/BSD-like with occasional variation.
  */
 
-#include "stdafx.h"
+#include "../../stdafx.h"
 #include "os_abstraction.h"
 #include "../../string_func.h"
 #include "../../3rdparty/fmt/format.h"

src/network/network_survey.cpp

@@ -9,7 +9,7 @@
 
 #include "../stdafx.h"
 #include "network_survey.h"
-#include "settings_table.h"
+#include "../settings_table.h"
 #include "network.h"
 #include "network_func.h"
 #include "../debug.h"

src/os/macosx/font_osx.cpp

@@ -22,7 +22,7 @@
 
 #include "../../table/control_codes.h"
 
-#include "safeguards.h"
+#include "../../safeguards.h"
 
 bool SetFallbackFont(FontCacheSettings *settings, const std::string &language_isocode, MissingGlyphSearcher *callback)
 {

src/os/macosx/font_osx.h

@@ -11,7 +11,7 @@
 #define FONT_OSX_H
 
 #include "../../fontcache/truetypefontcache.h"
-#include "os/macosx/macos.h"
+#include "macos.h"
 
 #include <CoreFoundation/CoreFoundation.h>
 

src/os/unix/font_unix.cpp

@@ -15,7 +15,7 @@
 
 #include <fontconfig/fontconfig.h>
 
-#include "safeguards.h"
+#include "../../safeguards.h"
 
 #include <ft2build.h>
 #include FT_FREETYPE_H

src/os/windows/font_win32.cpp

@@ -27,10 +27,10 @@
 
 #include <windows.h>
 #include <shlobj.h> /* SHGetFolderPath */
-#include "os/windows/win32.h"
+#include "win32.h"
 #undef small // Say what, Windows?
 
-#include "safeguards.h"
+#include "../../safeguards.h"
 
 struct EFCParam {
 	FontCacheSettings *settings;

src/pathfinder/water_regions.cpp

@@ -7,17 +7,17 @@
 
  /** @file water_regions.cpp Handles dividing the water in the map into square regions to assist pathfinding. */
 
-#include "stdafx.h"
-#include "map_func.h"
+#include "../stdafx.h"
+#include "../map_func.h"
 #include "water_regions.h"
-#include "tilearea_type.h"
-#include "track_func.h"
-#include "transport_type.h"
-#include "landscape.h"
-#include "tunnelbridge_map.h"
+#include "../tilearea_type.h"
+#include "../track_func.h"
+#include "../transport_type.h"
+#include "../landscape.h"
+#include "../tunnelbridge_map.h"
 #include "follow_track.hpp"
-#include "ship.h"
-#include "debug.h"
+#include "../ship.h"
+#include "../debug.h"
 
 using TWaterRegionTraversabilityBits = uint16_t;
 constexpr TWaterRegionPatchLabel FIRST_REGION_LABEL = 1;

src/pathfinder/water_regions.h

@@ -10,8 +10,8 @@
 #ifndef WATER_REGIONS_H
 #define WATER_REGIONS_H
 
-#include "tile_type.h"
-#include "map_func.h"
+#include "../tile_type.h"
+#include "../map_func.h"
 
 using TWaterRegionPatchLabel = uint8_t;
 using TWaterRegionIndex = uint;

src/rev.cpp.in

@@ -7,11 +7,11 @@
 
 /** @file rev.cpp Autogenerated file with the revision and such of OpenTTD. */
 
-#include "stdafx.h"
-#include "core/bitmath_func.hpp"
-#include "rev.h"
+#include "${CMAKE_SOURCE_DIR}/src/stdafx.h"
+#include "${CMAKE_SOURCE_DIR}/src/core/bitmath_func.hpp"
+#include "${CMAKE_SOURCE_DIR}/src/rev.h"
 
-#include "safeguards.h"
+#include "${CMAKE_SOURCE_DIR}/src/safeguards.h"
 
 /**
  * Is this version of OpenTTD a release version?

src/saveload/afterload.cpp

@@ -69,7 +69,7 @@
 #include <signal.h>
 
 #include "../safeguards.h"
-#include "window_func.h"
+#include "../window_func.h"
 
 extern Company *DoStartupNewCompany(bool is_ai, CompanyID company = INVALID_COMPANY);
 

src/table/airport_defaults.h

@@ -10,7 +10,7 @@
 #ifndef AIRPORT_DEFAULTS_H
 #define AIRPORT_DEFAULTS_H
 
-#include "timer/timer_game_calendar.h"
+#include "../timer/timer_game_calendar.h"
 
 /**
  * Definition of an airport tiles layout.

src/video/cocoa/cocoa_wnd.mm

@@ -35,7 +35,7 @@
 #include "../../textbuf_type.h"
 #include "../../toolbar_gui.h"
 
-#include "table/sprites.h"
+#include "../../table/sprites.h"
 
 /* Table data for key mapping. */
 #include "cocoa_keys.h"