--- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-03-08 20:50:42 UTC (rev 13888)
+++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-03-08 21:02:50 UTC (rev 13889)
@@ -332,17 +332,17 @@
string path = "tools" SSEP "rbuild" SSEP "backend" SSEP "mingw" SSEP "pch_detection.h";
system ( ssprintf("gcc -c %s", path.c_str()).c_str() );
path += ".gch";
+
+ FILE* f = fopen ( path.c_str(), "rb" );
+ if ( f )
{
- FILE* f = fopen ( path.c_str(), "rb" );
- if ( f )
- {
- use_pch = true;
- fclose(f);
- unlink ( path.c_str() );
- }
- else
- use_pch = false;
+ use_pch = true;
+ fclose(f);
+ unlink ( path.c_str() );
}
+ else
+ use_pch = false;
+
// TODO FIXME - eventually check for ROS_USE_PCH env var and
// allow that to override use_pch if true
}
--- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-03-08 20:50:42 UTC (rev 13888)
+++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-03-08 21:02:50 UTC (rev 13889)
@@ -857,7 +857,7 @@
else
{
fprintf ( fMakefile,
- "\t%s %s -o %s %s %s %s\n\n",
+ "\t%s %s -o %s %s %s %s\n",
linker.c_str (),
linkerParameters.c_str (),
target.c_str (),
@@ -867,7 +867,7 @@
}
fprintf ( fMakefile,
- "\t${rsym} %s %s\n",
+ "\t${rsym} %s %s\n\n",
target.c_str (),
target.c_str () );
}
@@ -1405,10 +1405,10 @@
objectsMacro.c_str (),
importLibraryDependencies.c_str () );
fprintf ( fMakefile,
- "\t${rm} %s\n\n",
+ "\t${rm} %s\n",
temp_exp.c_str () );
fprintf ( fMakefile,
- "\t${rsym} %s %s\n",
+ "\t${rsym} %s %s\n\n",
target.c_str (),
target.c_str () );
}