diff options
| author | truelight <truelight@openttd.org> | 2007-01-21 19:40:38 +0000 |
|---|---|---|
| committer | truelight <truelight@openttd.org> | 2007-01-21 19:40:38 +0000 |
| commit | 61eef2ded9343923c946dfbb5e9c1d90f5cf9204 (patch) | |
| tree | 64a47828edca0e87e333eae7ba09b9052608d09e | |
| parent | 3e93fecb68dd278ab9bcc60f2f41759b15eb1f5a (diff) | |
| download | openttd-61eef2ded9343923c946dfbb5e9c1d90f5cf9204.tar.xz | |
(svn r8326) -Fix r8304: forgot to update projects/generate to keep in mind the new WINCE tag in sources.list
-Fix: MSVC doesn't order files itself, so put win32.cpp in the right place ourself
-Update: update the MSVC projects files for r8324 (MiHaMiX)
| -rwxr-xr-x | projects/generate | 1 | ||||
| -rw-r--r-- | projects/langs.vcproj | 14 | ||||
| -rw-r--r-- | projects/langs_vs80.vcproj | 14 | ||||
| -rw-r--r-- | source.list | 4 |
4 files changed, 32 insertions, 1 deletions
diff --git a/projects/generate b/projects/generate index b36a9602e..fc87904b5 100755 --- a/projects/generate +++ b/projects/generate @@ -58,6 +58,7 @@ load_main_data() { if ($0 == "BEOS" && "'$os'" != "BEOS") { next; } if ($0 == "WIN32" && "'$os'" != "MINGW" && "'$os'" != "CYGWIN" && "'$os'" != "MSVC" ) { next; } + if ($0 == "WINCE" && "'$os'" != "WINCE") { next; } if ($0 == "MSVC" && "'$os'" != "MSVC") { next; } if ($0 == "DIRECTMUSIC" && "'$enable_directmusic'" != "1") { next; } diff --git a/projects/langs.vcproj b/projects/langs.vcproj index ab9690a65..c6d1d41a3 100644 --- a/projects/langs.vcproj +++ b/projects/langs.vcproj @@ -417,6 +417,20 @@ </FileConfiguration> </File> <File + RelativePath="..\src\lang\simplified_chinese.txt" + > + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCustomBuildTool" + Description="Generating simplified_chinese language file" + CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)"
" + AdditionalDependencies="" + Outputs="..\bin\lang\simplified_chinese.lng" + /> + </FileConfiguration> + </File> + <File RelativePath="..\src\lang\slovak.txt" > <FileConfiguration diff --git a/projects/langs_vs80.vcproj b/projects/langs_vs80.vcproj index 4de7acf98..ccbd2454d 100644 --- a/projects/langs_vs80.vcproj +++ b/projects/langs_vs80.vcproj @@ -425,6 +425,20 @@ </FileConfiguration> </File> <File + RelativePath="..\src\lang\simplified_chinese.txt" + > + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCustomBuildTool" + Description="Generating simplified_chinese language file" + CommandLine="..\objs\strgen\strgen.exe -s ..\src\lang -d ..\bin\lang "$(InputPath)"
" + AdditionalDependencies="" + Outputs="..\bin\lang\simplified_chinese.lng" + /> + </FileConfiguration> + </File> + <File RelativePath="..\src\lang\slovak.txt" > <FileConfiguration diff --git a/source.list b/source.list index a8ac13a5b..679457040 100644 --- a/source.list +++ b/source.list @@ -74,7 +74,6 @@ tgp.cpp thread.cpp tile.cpp #if WIN32 - win32.cpp #else #if WINCE win32.cpp @@ -90,6 +89,9 @@ vehicle.cpp viewport.cpp waypoint.cpp widget.cpp +#if WIN32 + win32.cpp +#end window.cpp # Header Files |