(svn r13577) -Change: group core files in source.list together

3 files changed, 154 insertions, 144 deletions

diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj
index 7004a16fa..c8864211a 100644
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -456,10 +456,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\core\alloc_func.cpp"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\animated_tile.cpp"
 				>
 			</File>
@@ -472,10 +468,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\core\bitmath_func.cpp"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\bmp.cpp"
 				>
 			</File>
@@ -684,10 +676,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\core\random_func.cpp"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\rev.cpp"
 				>
 			</File>
@@ -808,14 +796,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\core\alloc_func.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\core\alloc_type.hpp"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\animated_tile_func.h"
 				>
 			</File>
@@ -848,10 +828,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\core\bitmath_func.hpp"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\bmp.h"
 				>
 			</File>
@@ -996,14 +972,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\core\endian_func.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\core\endian_type.hpp"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\engine_base.h"
 				>
 			</File>
@@ -1020,10 +988,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\core\enum_type.hpp"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\fiber.hpp"
 				>
 			</File>
@@ -1052,10 +1016,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\core\geometry_type.hpp"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\gfx_func.h"
 				>
 			</File>
@@ -1120,18 +1080,10 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\core\math_func.hpp"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\md5.h"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\core\mem_func.hpp"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\minilzo.h"
 				>
 			</File>
@@ -1308,10 +1260,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\core\overflowsafe_type.hpp"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\pathfind.h"
 				>
 			</File>
@@ -1356,10 +1304,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\core\random_func.hpp"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\rev.h"
 				>
 			</File>
@@ -1452,14 +1396,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\core\smallvec_type.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\core\sort_func.hpp"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\sortlist_type.h"
 				>
 			</File>
@@ -1689,6 +1625,74 @@
 			</File>
 		</Filter>
 		<Filter
+			Name="Core Source Code"
+			>
+			<File
+				RelativePath=".\..\src\core\alloc_func.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\core\alloc_func.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\core\alloc_type.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\core\bitmath_func.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\core\bitmath_func.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\core\endian_func.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\core\endian_type.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\core\enum_type.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\core\geometry_type.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\core\math_func.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\core\mem_func.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\core\overflowsafe_type.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\core\random_func.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\core\random_func.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\core\smallvec_type.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\core\sort_func.hpp"
+				>
+			</File>
+		</Filter>
+		<Filter
 			Name="GUI Source Code"
 			>
 			<File
diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj
index 2e6db1a30..47407825e 100644
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -453,10 +453,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\core\alloc_func.cpp"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\animated_tile.cpp"
 				>
 			</File>
@@ -469,10 +465,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\core\bitmath_func.cpp"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\bmp.cpp"
 				>
 			</File>
@@ -681,10 +673,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\core\random_func.cpp"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\rev.cpp"
 				>
 			</File>
@@ -805,14 +793,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\core\alloc_func.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\core\alloc_type.hpp"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\animated_tile_func.h"
 				>
 			</File>
@@ -845,10 +825,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\core\bitmath_func.hpp"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\bmp.h"
 				>
 			</File>
@@ -993,14 +969,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\core\endian_func.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\core\endian_type.hpp"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\engine_base.h"
 				>
 			</File>
@@ -1017,10 +985,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\core\enum_type.hpp"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\fiber.hpp"
 				>
 			</File>
@@ -1049,10 +1013,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\core\geometry_type.hpp"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\gfx_func.h"
 				>
 			</File>
@@ -1117,18 +1077,10 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\core\math_func.hpp"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\md5.h"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\core\mem_func.hpp"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\minilzo.h"
 				>
 			</File>
@@ -1305,10 +1257,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\core\overflowsafe_type.hpp"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\pathfind.h"
 				>
 			</File>
@@ -1353,10 +1301,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\core\random_func.hpp"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\rev.h"
 				>
 			</File>
@@ -1449,14 +1393,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\core\smallvec_type.hpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\core\sort_func.hpp"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\sortlist_type.h"
 				>
 			</File>
@@ -1686,6 +1622,74 @@
 			</File>
 		</Filter>
 		<Filter
+			Name="Core Source Code"
+			>
+			<File
+				RelativePath=".\..\src\core\alloc_func.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\core\alloc_func.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\core\alloc_type.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\core\bitmath_func.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\core\bitmath_func.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\core\endian_func.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\core\endian_type.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\core\enum_type.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\core\geometry_type.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\core\math_func.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\core\mem_func.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\core\overflowsafe_type.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\core\random_func.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\core\random_func.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\core\smallvec_type.hpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\core\sort_func.hpp"
+				>
+			</File>
+		</Filter>
+		<Filter
 			Name="GUI Source Code"
 			>
 			<File
diff --git a/source.list b/source.list
index 2135dfb1b..9054647b5 100644
--- a/source.list
+++ b/source.list
@@ -1,10 +1,8 @@
 # Source Files
 airport.cpp
-core/alloc_func.cpp
 animated_tile.cpp
 articulated_vehicles.cpp
 aystar.cpp
-core/bitmath_func.cpp
 bmp.cpp
 callback_table.cpp
 cargopacket.cpp
@@ -62,7 +60,6 @@ pathfind.cpp
 players.cpp
 queue.cpp
 rail.cpp
-core/random_func.cpp
 rev.cpp
 road.cpp
 saveload.cpp
@@ -127,8 +124,6 @@ ai/ai.h
 aircraft.h
 airport.h
 airport_movement.h
-core/alloc_func.hpp
-core/alloc_type.hpp
 animated_tile_func.h
 articulated_vehicles.h
 autoreplace_base.h
@@ -137,7 +132,6 @@ autoreplace_gui.h
 autoreplace_type.h
 autoslope.h
 aystar.h
-core/bitmath_func.hpp
 bmp.h
 bridge.h
 callback_table.h
@@ -174,13 +168,10 @@ economy_type.h
 effectvehicle_func.h
 effectvehicle_base.h
 elrail_func.h
-core/endian_func.hpp
-core/endian_type.hpp
 engine_base.h
 engine_func.h
 engine_gui.h
 engine_type.h
-core/enum_type.hpp
 fiber.hpp
 fileio.h
 fios.h
@@ -188,7 +179,6 @@ fontcache.h
 functions.h
 gamelog.h
 genworld.h
-core/geometry_type.hpp
 gfx_func.h
 gfx_type.h
 gfxinit.h
@@ -205,9 +195,7 @@ livery.h
 lzoconf.h
 map_func.h
 map_type.h
-core/math_func.hpp
 md5.h
-core/mem_func.hpp
 minilzo.h
 mixer.h
 music.h
@@ -252,7 +240,6 @@ openttd.h
 order_base.h
 order_func.h
 order_type.h
-core/overflowsafe_type.hpp
 pathfind.h
 player_base.h
 player_face.h
@@ -264,7 +251,6 @@ queue.h
 rail.h
 rail_gui.h
 rail_type.h
-core/random_func.hpp
 rev.h
 road_cmd.h
 road_func.h
@@ -288,8 +274,6 @@ signs_func.h
 signs_type.h
 slope_func.h
 slope_type.h
-core/smallvec_type.hpp
-core/sort_func.hpp
 sortlist_type.h
 sound_func.h
 sound_type.h
@@ -362,6 +346,24 @@ video/cocoa/cocoa_keys.h
 video/cocoa/cocoa_v.h
 #end
 
+# Core Source Code
+core/alloc_func.hpp
+core/alloc_func.cpp
+core/alloc_type.hpp
+core/bitmath_func.hpp
+core/bitmath_func.cpp
+core/endian_func.hpp
+core/endian_type.hpp
+core/enum_type.hpp
+core/geometry_type.hpp
+core/math_func.hpp
+core/mem_func.hpp
+core/overflowsafe_type.hpp
+core/random_func.hpp
+core/random_func.cpp
+core/smallvec_type.hpp
+core/sort_func.hpp
+
 # GUI Source Code
 aircraft_gui.cpp
 airport_gui.cpp