- 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.

svn path=/trunk/; revision=32399

diff --git a/reactos/tools/rbuild/backend/mingw/mingw.h b/reactos/tools/rbuild/backend/mingw/mingw.h
index b007a68..65a5029 100644 (file)
--- a/reactos/tools/rbuild/backend/mingw/mingw.h
+++ b/reactos/tools/rbuild/backend/mingw/mingw.h
@@ -133,10 +133,11 @@ public:
        ~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 );

diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
index 2de89cd..492e464 100644 (file)
--- a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
+++ b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
@@ -18,6 +18,7 @@
  */
 #include "../../pch.h"
 #include <assert.h>
+#include <algorithm>
 
 #include "../../rbuild.h"
 #include "mingw.h"
@@ -615,13 +616,15 @@ MingwModuleHandler::GenerateCleanTarget () const
        }
        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" );

diff --git a/reactos/tools/rbuild/backend/mingw/proxymakefile.cpp b/reactos/tools/rbuild/backend/mingw/proxymakefile.cpp
index a38a07e..094a736 100644 (file)
--- a/reactos/tools/rbuild/backend/mingw/proxymakefile.cpp
+++ b/reactos/tools/rbuild/backend/mingw/proxymakefile.cpp
@@ -33,7 +33,7 @@ ProxyMakefile::~ProxyMakefile ()
 }
 
 bool
-ProxyMakefile::GenerateProxyMakefile ( Module& module )
+ProxyMakefile::GenerateProxyMakefile ( const Module& module )
 {
        return module.output->directory == OutputDirectory;
 }

diff --git a/reactos/tools/rbuild/rbuild.vcproj b/reactos/tools/rbuild/rbuild.vcproj
index 8ab11e1..eeabf15 100644 (file)
--- a/reactos/tools/rbuild/rbuild.vcproj
+++ b/reactos/tools/rbuild/rbuild.vcproj
@@ -133,7 +133,7 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="..,../../lib/inflib,../../include/reactos;../../include"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;INFLIB_HOST"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;INFLIB_HOST;_CRT_SECURE_NO_WARNINGS"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="1"\r
                                DefaultCharIsUnsigned="true"\r