Mercurial > hg > openttd

changeset 17433:83d6afc92044 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r22187) -Fix: some reordering in source.list
author glx <glx@openttd.org>
date Fri, 04 Mar 2011 22:25:07 +0000
parents 1a30917fa0d3
children d34d38243caa
files projects/openttd_vs100.vcxproj projects/openttd_vs100.vcxproj.filters projects/openttd_vs80.vcproj projects/openttd_vs90.vcproj source.list
diffstat 5 files changed, 65 insertions(+), 65 deletions(-) [+]
line wrap: on
line diff
--- a/projects/openttd_vs100.vcxproj
+++ b/projects/openttd_vs100.vcxproj
@@ -528,7 +528,6 @@
     <ClInclude Include="..\src\roadveh.h" />
     <ClInclude Include="..\src\screenshot.h" />
     <ClInclude Include="..\src\sdl.h" />
-    <ClInclude Include="..\src\smallmap_gui.h" />
     <ClInclude Include="..\src\sound\sdl_s.h" />
     <ClInclude Include="..\src\video\sdl_v.h" />
     <ClInclude Include="..\src\settings_func.h" />
@@ -542,6 +541,7 @@
     <ClInclude Include="..\src\signs_type.h" />
     <ClInclude Include="..\src\slope_func.h" />
     <ClInclude Include="..\src\slope_type.h" />
+    <ClInclude Include="..\src\smallmap_gui.h" />
     <ClInclude Include="..\src\sortlist_type.h" />
     <ClInclude Include="..\src\sound_func.h" />
     <ClInclude Include="..\src\sound_type.h" />
@@ -565,9 +565,9 @@
     <ClInclude Include="..\src\textbuf_gui.h" />
     <ClInclude Include="..\src\texteff.hpp" />
     <ClInclude Include="..\src\tgp.h" />
-    <ClInclude Include="..\src\tilearea_type.h" />
     <ClInclude Include="..\src\tile_cmd.h" />
     <ClInclude Include="..\src\tile_type.h" />
+    <ClInclude Include="..\src\tilearea_type.h" />
     <ClInclude Include="..\src\tilehighlight_func.h" />
     <ClInclude Include="..\src\tilehighlight_type.h" />
     <ClInclude Include="..\src\timetable.h" />
@@ -746,9 +746,9 @@
     <ClCompile Include="..\src\saveload\vehicle_sl.cpp" />
     <ClCompile Include="..\src\saveload\waypoint_sl.cpp" />
     <ClInclude Include="..\src\table\airport_defaults.h" />
+    <ClInclude Include="..\src\table\airport_movement.h" />
     <ClInclude Include="..\src\table\airporttile_ids.h" />
     <ClInclude Include="..\src\table\airporttiles.h" />
-    <ClInclude Include="..\src\table\airport_movement.h" />
     <ClInclude Include="..\src\table\animcursors.h" />
     <ClInclude Include="..\src\table\autorail.h" />
     <ClInclude Include="..\src\table\bridge_land.h" />
@@ -1041,13 +1041,13 @@
     <ClInclude Include="..\src\network\core\packet.h" />
     <ClCompile Include="..\src\network\core\tcp.cpp" />
     <ClInclude Include="..\src\network\core\tcp.h" />
+    <ClCompile Include="..\src\network\core\tcp_admin.cpp" />
+    <ClInclude Include="..\src\network\core\tcp_admin.h" />
     <ClCompile Include="..\src\network\core\tcp_connect.cpp" />
     <ClCompile Include="..\src\network\core\tcp_content.cpp" />
     <ClInclude Include="..\src\network\core\tcp_content.h" />
     <ClCompile Include="..\src\network\core\tcp_game.cpp" />
     <ClInclude Include="..\src\network\core\tcp_game.h" />
-    <ClCompile Include="..\src\network\core\tcp_admin.cpp" />
-    <ClInclude Include="..\src\network\core\tcp_admin.h" />
     <ClCompile Include="..\src\network\core\tcp_http.cpp" />
     <ClInclude Include="..\src\network\core\tcp_http.h" />
     <ClInclude Include="..\src\network\core\tcp_listen.h" />
--- a/projects/openttd_vs100.vcxproj.filters
+++ b/projects/openttd_vs100.vcxproj.filters
@@ -804,9 +804,6 @@
     <ClInclude Include="..\src\sdl.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\smallmap_gui.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\sound\sdl_s.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -846,6 +843,9 @@
     <ClInclude Include="..\src\slope_type.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\smallmap_gui.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\sortlist_type.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -915,15 +915,15 @@
     <ClInclude Include="..\src\tgp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\tilearea_type.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\tile_cmd.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\src\tile_type.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\tilearea_type.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\tilehighlight_func.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -1458,15 +1458,15 @@
     <ClInclude Include="..\src\table\airport_defaults.h">
       <Filter>Tables</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\table\airport_movement.h">
+      <Filter>Tables</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\table\airporttile_ids.h">
       <Filter>Tables</Filter>
     </ClInclude>
     <ClInclude Include="..\src\table\airporttiles.h">
       <Filter>Tables</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\table\airport_movement.h">
-      <Filter>Tables</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\table\animcursors.h">
       <Filter>Tables</Filter>
     </ClInclude>
@@ -2343,6 +2343,12 @@
     <ClInclude Include="..\src\network\core\tcp.h">
       <Filter>Network Core</Filter>
     </ClInclude>
+    <ClCompile Include="..\src\network\core\tcp_admin.cpp">
+      <Filter>Network Core</Filter>
+    </ClCompile>
+    <ClInclude Include="..\src\network\core\tcp_admin.h">
+      <Filter>Network Core</Filter>
+    </ClInclude>
     <ClCompile Include="..\src\network\core\tcp_connect.cpp">
       <Filter>Network Core</Filter>
     </ClCompile>
@@ -2358,12 +2364,6 @@
     <ClInclude Include="..\src\network\core\tcp_game.h">
       <Filter>Network Core</Filter>
     </ClInclude>
-    <ClCompile Include="..\src\network\core\tcp_admin.cpp">
-      <Filter>Network Core</Filter>
-    </ClCompile>
-    <ClInclude Include="..\src\network\core\tcp_admin.h">
-      <Filter>Network Core</Filter>
-    </ClInclude>
     <ClCompile Include="..\src\network\core\tcp_http.cpp">
       <Filter>Network Core</Filter>
     </ClCompile>
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -1387,10 +1387,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\smallmap_gui.h"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\sound\sdl_s.h"
 				>
 			</File>
@@ -1443,6 +1439,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\..\src\smallmap_gui.h"
+				>
+			</File>
+			<File
 				RelativePath=".\..\src\sortlist_type.h"
 				>
 			</File>
@@ -1535,10 +1535,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\tilearea_type.h"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\tile_cmd.h"
 				>
 			</File>
@@ -1547,6 +1543,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\..\src\tilearea_type.h"
+				>
+			</File>
+			<File
 				RelativePath=".\..\src\tilehighlight_func.h"
 				>
 			</File>
@@ -2283,6 +2283,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\..\src\table\airport_movement.h"
+				>
+			</File>
+			<File
 				RelativePath=".\..\src\table\airporttile_ids.h"
 				>
 			</File>
@@ -2291,10 +2295,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\table\airport_movement.h"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\table\animcursors.h"
 				>
 			</File>
@@ -3519,6 +3519,14 @@
 				>
 			</File>
 			<File
+				RelativePath=".\..\src\network\core\tcp_admin.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\network\core\tcp_admin.h"
+				>
+			</File>
+			<File
 				RelativePath=".\..\src\network\core\tcp_connect.cpp"
 				>
 			</File>
@@ -3539,14 +3547,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\network\core\tcp_admin.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\network\core\tcp_admin.h"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\network\core\tcp_http.cpp"
 				>
 			</File>
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -1384,10 +1384,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\smallmap_gui.h"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\sound\sdl_s.h"
 				>
 			</File>
@@ -1440,6 +1436,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\..\src\smallmap_gui.h"
+				>
+			</File>
+			<File
 				RelativePath=".\..\src\sortlist_type.h"
 				>
 			</File>
@@ -1532,10 +1532,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\tilearea_type.h"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\tile_cmd.h"
 				>
 			</File>
@@ -1544,6 +1540,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\..\src\tilearea_type.h"
+				>
+			</File>
+			<File
 				RelativePath=".\..\src\tilehighlight_func.h"
 				>
 			</File>
@@ -2280,6 +2280,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\..\src\table\airport_movement.h"
+				>
+			</File>
+			<File
 				RelativePath=".\..\src\table\airporttile_ids.h"
 				>
 			</File>
@@ -2288,10 +2292,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\table\airport_movement.h"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\table\animcursors.h"
 				>
 			</File>
@@ -3516,6 +3516,14 @@
 				>
 			</File>
 			<File
+				RelativePath=".\..\src\network\core\tcp_admin.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\..\src\network\core\tcp_admin.h"
+				>
+			</File>
+			<File
 				RelativePath=".\..\src\network\core\tcp_connect.cpp"
 				>
 			</File>
@@ -3536,14 +3544,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\network\core\tcp_admin.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\..\src\network\core\tcp_admin.h"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\network\core\tcp_http.cpp"
 				>
 			</File>
--- a/source.list
+++ b/source.list
@@ -261,7 +261,6 @@
 roadveh.h
 screenshot.h
 sdl.h
-smallmap_gui.h
 sound/sdl_s.h
 video/sdl_v.h
 settings_func.h
@@ -275,6 +274,7 @@
 signs_type.h
 slope_func.h
 slope_type.h
+smallmap_gui.h
 sortlist_type.h
 sound_func.h
 sound_type.h
@@ -298,9 +298,9 @@
 textbuf_gui.h
 texteff.hpp
 tgp.h
-tilearea_type.h
 tile_cmd.h
 tile_type.h
+tilearea_type.h
 tilehighlight_func.h
 tilehighlight_type.h
 timetable.h
@@ -506,9 +506,9 @@
 
 # Tables
 table/airport_defaults.h
+table/airport_movement.h
 table/airporttile_ids.h
 table/airporttiles.h
-table/airport_movement.h
 table/animcursors.h
 table/autorail.h
 table/bridge_land.h
@@ -836,13 +836,13 @@
 network/core/packet.h
 network/core/tcp.cpp
 network/core/tcp.h
+network/core/tcp_admin.cpp
+network/core/tcp_admin.h
 network/core/tcp_connect.cpp
 network/core/tcp_content.cpp
 network/core/tcp_content.h
 network/core/tcp_game.cpp
 network/core/tcp_game.h
-network/core/tcp_admin.cpp
-network/core/tcp_admin.h
 network/core/tcp_http.cpp
 network/core/tcp_http.h
 network/core/tcp_listen.h