* Remove empty line * Rearrange some dependencies Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp _____
Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-04-22 09:45:17 UTC (rev 14737) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-04-22 10:12:37 UTC (rev 14738) @@ -1403,12 +1403,14 @@
fprintf ( fMakefile, "\t$(ECHO_AR)\n" );
fprintf ( fMakefile, - "\t%s -rc $@ %s\n\n", + "\t%s -rc $@ %s\n", ar.c_str (), objs_macro.c_str ());
GenerateCleanObjectsAsYouGoCode ();
+ fprintf ( fMakefile, "\n" ); + return archiveFilename; }
@@ -2037,8 +2039,7 @@ { GenerateRules ();
- string dependencies = - objectsMacro + " " + linkDepsMacro; + string dependencies = linkDepsMacro + " " + objectsMacro;
string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll",
module.entrypoint.c_str (), @@ -2085,7 +2086,7 @@ { GenerateRules ();
- string dependencies = objectsMacro + " " + linkDepsMacro; + string dependencies = linkDepsMacro + " " + objectsMacro;
string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -mdll",
module.entrypoint.c_str (), @@ -2131,8 +2132,7 @@ { GenerateRules ();
- string dependencies = - objectsMacro + " " + linkDepsMacro; + string dependencies = linkDepsMacro + " " + objectsMacro;
string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -nostdlib -mdll",
module.entrypoint.c_str (), @@ -2178,8 +2178,7 @@ { GenerateRules ();
- string dependencies = - objectsMacro + " " + linkDepsMacro; + string dependencies = linkDepsMacro + " " + objectsMacro;
string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -nostdlib",
module.entrypoint.c_str (), @@ -2249,7 +2248,7 @@ { GenerateRules ();
- string dependencies = objectsMacro + " " + linkDepsMacro; + string dependencies = linkDepsMacro + " " + objectsMacro;
string linker; if ( module.cplusplus ) @@ -2301,8 +2300,7 @@ { GenerateRules ();
- string dependencies = - objectsMacro + " " + linkDepsMacro; + string dependencies = linkDepsMacro + " " + objectsMacro;
string linker; if ( module.cplusplus ) @@ -2354,8 +2352,7 @@ { GenerateRules ();
- string dependencies = - objectsMacro + " " + linkDepsMacro; + string dependencies = linkDepsMacro + " " + objectsMacro;
string linker; if ( module.cplusplus ) @@ -2836,7 +2833,7 @@ { GenerateRules ();
- string dependencies = objectsMacro + " " + linkDepsMacro; + string dependencies = linkDepsMacro + " " + objectsMacro;
string linker; if ( module.cplusplus )