Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-23 23:43:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Only add a command for deleting the proxy makefile, when one was really generated.

Browse source 
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
This commit is contained in:
Colin Finck 2008-02-16 23:45:23 +00:00
parent de244cca92
commit cc6beed26a
4 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
reactos/tools/rbuild/backend/mingw/mingw.h
View file

@ -133,10 +133,11 @@ public:
~ProxyMakefile (); ~ProxyMakefile ();
void GenerateProxyMakefiles ( bool verbose, void GenerateProxyMakefiles ( bool verbose,
std::string outputTree ); std::string outputTree );
static bool GenerateProxyMakefile ( const Module& module );
private: private:
std::string GeneratePathToParentDirectory ( int numberOfParentDirectories ); std::string GeneratePathToParentDirectory ( int numberOfParentDirectories );
std::string GetPathToTopDirectory ( Module& module ); std::string GetPathToTopDirectory ( Module& module );
bool GenerateProxyMakefile ( Module& module );
void GenerateProxyMakefileForModule ( Module& module, void GenerateProxyMakefileForModule ( Module& module,
bool verbose, bool verbose,
std::string outputTree ); std::string outputTree );

5
reactos/tools/rbuild/backend/mingw/modulehandler.cpp
View file

@ -18,6 +18,7 @@
*/ */
#include "../../pch.h" #include "../../pch.h"
#include <assert.h> #include <assert.h>
#include <algorithm>
#include "../../rbuild.h" #include "../../rbuild.h"
#include "mingw.h" #include "mingw.h"
@ -615,13 +616,15 @@ MingwModuleHandler::GenerateCleanTarget () const
} }
fprintf ( fMakefile, " 2>$(NUL)\n" ); fprintf ( fMakefile, " 2>$(NUL)\n" );
if ( module.name != "zlib" ) /* Avoid make warning */ if( ProxyMakefile::GenerateProxyMakefile(module) )
{ {
DirectoryLocation root; DirectoryLocation root;
if ( backend->configuration.GenerateProxyMakefilesInSourceTree ) if ( backend->configuration.GenerateProxyMakefilesInSourceTree )
root = SourceDirectory; root = SourceDirectory;
else else
root = OutputDirectory; root = OutputDirectory;
FileLocation proxyMakefile ( root, FileLocation proxyMakefile ( root,
module.output->relative_path, module.output->relative_path,
"GNUmakefile" ); "GNUmakefile" );

2
reactos/tools/rbuild/backend/mingw/proxymakefile.cpp
View file

@ -33,7 +33,7 @@ ProxyMakefile::~ProxyMakefile ()
} }
bool bool
ProxyMakefile::GenerateProxyMakefile ( Module& module ) ProxyMakefile::GenerateProxyMakefile ( const Module& module )
{ {
return module.output->directory == OutputDirectory; return module.output->directory == OutputDirectory;
} }

2
reactos/tools/rbuild/rbuild.vcproj
View file

@ -133,7 +133,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..,../../lib/inflib,../../include/reactos;../../include" AdditionalIncludeDirectories="..,../../lib/inflib,../../include/reactos;../../include"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;INFLIB_HOST" PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;INFLIB_HOST;_CRT_SECURE_NO_WARNINGS"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="1" RuntimeLibrary="1"
DefaultCharIsUnsigned="true" DefaultCharIsUnsigned="true"