[ros-diffs] [cwittich] 25100: fix version information display when using yasm

Author: cwittich
Date: Sat Dec  9 16:47:38 2006
New Revision: 25100

URL: http://svn.reactos.org/svn/reactos?rev=25100&view=rev
Log:
fix version information display when using yasm

Modified:
    trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp

Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw/...
==============================================================================
--- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp (original)
+++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Sat Dec  9 16:47:38 2006
@@ -656,7 +656,7 @@
    	NUL,
    	NUL );
    int exitcode = system ( command.c_str () );
-	return (exitcode == 0);
+	return (bool) (exitcode == 0);
 }

void
@@ -714,7 +714,7 @@
    	NUL,
    	NUL );
    int exitcode = system ( command.c_str () );
-	return (exitcode == 0);
+	return (bool) (exitcode == 0);
 }

string
@@ -757,10 +757,21 @@
 string
 MingwBackend::GetNetwideAssemblerVersion ( const string& nasmCommand )
 {
-	string versionCommand = ssprintf ( "%s -v",
-	                                   nasmCommand.c_str (),
-	                                   NUL,
-	                                   NUL );
+	string versionCommand;
+	if ( nasmCommand.find("yasm") != std::string::npos )
+	{
+		versionCommand = ssprintf ( "%s --version",
+										   nasmCommand.c_str (),
+										   NUL,
+										   NUL );
+	}
+	else
+	{
+		versionCommand = ssprintf ( "%s -v",
+										   nasmCommand.c_str (),
+										   NUL,
+										   NUL );
+	}
    return GetVersionString( versionCommand );
 }