Merge 15329:15546 from trunk

svn path=/branches/xmlbuildsystem/; revision=15547
This commit is contained in:
Casper Hornstrup 2005-05-27 19:29:24 +00:00
commit 062423314c
378 changed files with 32303 additions and 30029 deletions

View file

@ -981,21 +981,20 @@ MingwModuleHandler::GenerateWinebuildCommands (
dependencies.c_str () );
fprintf ( fMakefile, "\t$(ECHO_WINEBLD)\n" );
fprintf ( fMakefile,
"\t%s --def=%s -o %s\n",
"\t%s -o %s --def -E %s\n",
"$(Q)$(WINEBUILD_TARGET)",
sourceFilename.c_str (),
def_file.c_str () );
def_file.c_str (),
sourceFilename.c_str () );
fprintf ( fMakefile,
"%s: %s $(WINEBUILD_TARGET)\n",
stub_file.c_str (),
sourceFilename.c_str () );
fprintf ( fMakefile, "\t$(ECHO_WINEBLD)\n" );
fprintf ( fMakefile,
"\t%s --pedll=%s -o %s\n",
"\t%s -o %s --pedll %s\n",
"$(Q)$(WINEBUILD_TARGET)",
sourceFilename.c_str (),
stub_file.c_str () );
stub_file.c_str (),
sourceFilename.c_str () );
}
string