[ros-diffs] [cfinck] 32399: - Only add a command for deleting the proxy makefile, when one was really generated. Should fix all those "Error 1 (ignored)" warnings (if there aren't even more problems ; -) - Include <algorithm> in modulehandler.cpp. Fixes compilation with MSVC. - Add _CRT_SECURE_NO_WARNINGS to the MSVC project file to disable a bunch of MSVC warnings.

[cfinck at svn.reactos.org]

Author: cfinck
Date: Sun Feb 17 02:45:23 2008
New Revision: 32399

URL: http://svn.reactos.org/svn/reactos?rev=32399&view=rev
Log:
- Only add a command for deleting the proxy makefile, when one was really generated.
  Should fix all those "Error 1 (ignored)" warnings (if there aren't even more problems ;-)
- Include <algorithm> in modulehandler.cpp. Fixes compilation with MSVC.
- Add _CRT_SECURE_NO_WARNINGS to the MSVC project file to disable a bunch of MSVC warnings.

Modified:
    trunk/reactos/tools/rbuild/backend/mingw/mingw.h
    trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
    trunk/reactos/tools/rbuild/backend/mingw/proxymakefile.cpp
    trunk/reactos/tools/rbuild/rbuild.vcproj

Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw/mingw.h?rev=32399&r1=32398&r2=32399&view=diff
==============================================================================
--- trunk/reactos/tools/rbuild/backend/mingw/mingw.h (original)
+++ trunk/reactos/tools/rbuild/backend/mingw/mingw.h Sun Feb 17 02:45:23 2008
@@ -133,10 +133,11 @@
 	~ProxyMakefile ();
 	void GenerateProxyMakefiles ( bool verbose,
                                       std::string outputTree );
+	static bool GenerateProxyMakefile ( const Module& module );
+
 private:
 	std::string GeneratePathToParentDirectory ( int numberOfParentDirectories );
 	std::string GetPathToTopDirectory ( Module& module );
-	bool GenerateProxyMakefile ( Module& module );
 	void GenerateProxyMakefileForModule ( Module& module,
                                               bool verbose,
                                               std::string outputTree );

Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp?rev=32399&r1=32398&r2=32399&view=diff
==============================================================================
--- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original)
+++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Sun Feb 17 02:45:23 2008
@@ -18,6 +18,7 @@
  */
 #include "../../pch.h"
 #include <assert.h>
+#include <algorithm>
 
 #include "../../rbuild.h"
 #include "mingw.h"
@@ -615,13 +616,15 @@
 	}
 	fprintf ( fMakefile, " 2>$(NUL)\n" );
 
-	if ( module.name != "zlib" ) /* Avoid make warning */
+    if( ProxyMakefile::GenerateProxyMakefile(module) )
 	{
 		DirectoryLocation root;
+
 		if ( backend->configuration.GenerateProxyMakefilesInSourceTree )
 			root = SourceDirectory;
 		else
 			root = OutputDirectory;
+
 		FileLocation proxyMakefile ( root,
 		                             module.output->relative_path,
 		                            "GNUmakefile" );

Modified: trunk/reactos/tools/rbuild/backend/mingw/proxymakefile.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw/proxymakefile.cpp?rev=32399&r1=32398&r2=32399&view=diff
==============================================================================
--- trunk/reactos/tools/rbuild/backend/mingw/proxymakefile.cpp (original)
+++ trunk/reactos/tools/rbuild/backend/mingw/proxymakefile.cpp Sun Feb 17 02:45:23 2008
@@ -33,7 +33,7 @@
 }
 
 bool
-ProxyMakefile::GenerateProxyMakefile ( Module& module )
+ProxyMakefile::GenerateProxyMakefile ( const Module& module )
 {
 	return module.output->directory == OutputDirectory;
 }

Modified: trunk/reactos/tools/rbuild/rbuild.vcproj
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.vcproj?rev=32399&r1=32398&r2=32399&view=diff
==============================================================================
--- trunk/reactos/tools/rbuild/rbuild.vcproj (original)
+++ trunk/reactos/tools/rbuild/rbuild.vcproj Sun Feb 17 02:45:23 2008
@@ -133,7 +133,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..,../../lib/inflib,../../include/reactos;../../include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;INFLIB_HOST"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;INFLIB_HOST;_CRT_SECURE_NO_WARNINGS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				DefaultCharIsUnsigned="true"