Mercurial > hg > openttd

changeset 11526:aea3c6ad1ab4 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r15887) -Fix: Reorder dmusic.cpp / null_m.cpp in source.list so msvc doesn't reorder them in the generated project files.
author yexo <yexo@openttd.org>
date Sun, 29 Mar 2009 11:03:15 +0000
parents bbb51b4fef13
children e1495d47b9d5
files projects/openttd_vs80.vcproj projects/openttd_vs90.vcproj source.list
diffstat 3 files changed, 12 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -3448,14 +3448,14 @@
 			Name="Music"
 			>
 			<File
+				RelativePath=".\..\src\music\dmusic.cpp"
+				>
+			</File>
+			<File
 				RelativePath=".\..\src\music\null_m.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\music\dmusic.cpp"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\music\win32_m.cpp"
 				>
 			</File>
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -3445,14 +3445,14 @@
 			Name="Music"
 			>
 			<File
+				RelativePath=".\..\src\music\dmusic.cpp"
+				>
+			</File>
+			<File
 				RelativePath=".\..\src\music\null_m.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\music\dmusic.cpp"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\music\win32_m.cpp"
 				>
 			</File>
--- a/source.list
+++ b/source.list
@@ -846,7 +846,6 @@
 #end
 
 # Music
-music/null_m.cpp
 #if DEDICATED
 #else
 #if ALLEGRO
@@ -855,6 +854,10 @@
 #if DIRECTMUSIC
 	music/dmusic.cpp
 #end
+#end
+music/null_m.cpp
+#if DEDICATED
+#else
 #if WIN32
 	music/win32_m.cpp
 #else