(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)
This commit is contained in:
		@@ -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; }
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -416,6 +416,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"
 | 
			
		||||
			>
 | 
			
		||||
 
 | 
			
		||||
@@ -424,6 +424,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"
 | 
			
		||||
			>
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user