diff options
| author | yexo <yexo@openttd.org> | 2009-03-29 11:03:15 +0000 |
|---|---|---|
| committer | yexo <yexo@openttd.org> | 2009-03-29 11:03:15 +0000 |
| commit | 9eff54febeeef8c50adaea0514eae1072ef515f1 (patch) | |
| tree | 04173c89d67f706d750a69bd543c8e8c3bc00dc9 | |
| parent | a4139d56931a25e5e44e29a9f671958057f701bf (diff) | |
| download | openttd-9eff54febeeef8c50adaea0514eae1072ef515f1.tar.xz | |
(svn r15887) -Fix: Reorder dmusic.cpp / null_m.cpp in source.list so msvc doesn't reorder them in the generated project files.
| -rw-r--r-- | projects/openttd_vs80.vcproj | 4 | ||||
| -rw-r--r-- | projects/openttd_vs90.vcproj | 4 | ||||
| -rw-r--r-- | source.list | 5 |
3 files changed, 8 insertions, 5 deletions
diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj index 57aecf0c3..89708db60 100644 --- a/projects/openttd_vs80.vcproj +++ b/projects/openttd_vs80.vcproj @@ -3448,11 +3448,11 @@ Name="Music" > <File - RelativePath=".\..\src\music\null_m.cpp" + RelativePath=".\..\src\music\dmusic.cpp" > </File> <File - RelativePath=".\..\src\music\dmusic.cpp" + RelativePath=".\..\src\music\null_m.cpp" > </File> <File diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj index c724e0e54..bd17b422d 100644 --- a/projects/openttd_vs90.vcproj +++ b/projects/openttd_vs90.vcproj @@ -3445,11 +3445,11 @@ Name="Music" > <File - RelativePath=".\..\src\music\null_m.cpp" + RelativePath=".\..\src\music\dmusic.cpp" > </File> <File - RelativePath=".\..\src\music\dmusic.cpp" + RelativePath=".\..\src\music\null_m.cpp" > </File> <File diff --git a/source.list b/source.list index 8dde15af0..452a2c3e8 100644 --- a/source.list +++ b/source.list @@ -846,7 +846,6 @@ video/null_v.cpp #end # Music -music/null_m.cpp #if DEDICATED #else #if ALLEGRO @@ -855,6 +854,10 @@ music/null_m.cpp #if DIRECTMUSIC music/dmusic.cpp #end +#end +music/null_m.cpp +#if DEDICATED +#else #if WIN32 music/win32_m.cpp #else |