Index: tools/rbuild/backend/msvc/msvcmaker.cpp
===================================================================
--- tools/rbuild/backend/msvc/msvcmaker.cpp	(revision 19419)
+++ tools/rbuild/backend/msvc/msvcmaker.cpp	(working copy)
@@ -261,26 +261,21 @@
 	if ( !lib && !exe ) fprintf ( OUT, "MTL=midl.exe\r\n" );
 	fprintf ( OUT, "RSC=rc.exe\r\n" );
 
-	int n = 0;
-
 	std::string output_dir;
 	for ( size_t icfg = 0; icfg < cfgs.size(); icfg++ )
 	{
 		std::string& cfg = cfgs[icfg];
-		if ( icfg )
+		if ( icfg == 0 )
 		{
-			if ( n == 0 )
-			{
-				fprintf ( OUT, "!IF  \"$(CFG)\" == \"%s\"\r\n", cfg.c_str() );
-				fprintf ( OUT, "\r\n" );
-			}
-			else
-			{
-				fprintf ( OUT, "\r\n" );
-				fprintf ( OUT, "!ELSEIF  \"$(CFG)\" == \"%s\"\r\n", cfg.c_str() );
-				fprintf ( OUT, "\r\n" );
-			}
+			fprintf ( OUT, "!IF  \"$(CFG)\" == \"%s\"\r\n", cfg.c_str() );
+			fprintf ( OUT, "\r\n" );
 		}
+		else
+		{
+			fprintf ( OUT, "\r\n" );
+			fprintf ( OUT, "!ELSEIF  \"$(CFG)\" == \"%s\"\r\n", cfg.c_str() );
+			fprintf ( OUT, "\r\n" );
+		}
 
 		bool debug = !strstr ( cfg.c_str(), "Release" );
 		bool msvc_headers = ( 0 != strstr ( cfg.c_str(), "MSVC Headers" ) );
@@ -569,8 +564,6 @@
 			fprintf ( OUT, "# ADD BASE LIB32 /nologo\r\n" );
 			fprintf ( OUT, "# ADD LIB32 /nologo\r\n" );
 		}
-
-		n++;
 	}
 
 	if ( cfgs.size() != 0 )