[tkreuzer] 46785: reduce diff to trunk

Author: tkreuzer
Date: Fri Apr  9 05:36:02 2010
New Revision: 46785

URL: http://svn.reactos.org/svn/reactos?rev=46785&view=rev
Log:
reduce diff to trunk

Modified:
    branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak
    branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp

Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools/...
==============================================================================
--- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/compilers/gcc.mak [iso-8859-1] Fri Apr  9 05:36:02 2010
@@ -155,3 +155,4 @@
 endif

endef
+

Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools/...
==============================================================================
--- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Fri Apr  9 05:36:02 2010
@@ -483,7 +483,7 @@

// We use our proprietary "ofmt_stub.a" to implement a stub for "_get_output_format" required by "libmingwex.a".
    	// This archive just contains the compiled "ofmt_stub.s" supplied with the MinGW Runtime sources.
-		fprintf ( fMakefile, "PROJECT_CXXLIBS := "$(shell ${TARGET_CPP} -print-file-name=libstdc++.a)" "$(shell ${TARGET_CPP} -print-libgcc-file-name)" "$(shell ${TARGET_CPP} -print-file-name=libmingw32.a)" "$(shell ${TARGET_CPP} -print-file-name=libmingwex.a)" "$(shell ${TARGET_CPP} -print-file-name=ofmt_stub.a)" "$(shell ${TARGET_CPP} -print-file-name=libcoldname.a)"\n" );
+		fprintf ( fMakefile, "PROJECT_CXXLIBS := "$(shell ${TARGET_CPP} -print-file-name=libstdc++.a)" "$(shell ${TARGET_CPP} -print-libgcc-file-name)" "$(shell ${TARGET_CPP} -print-file-name=libmingw32.a)" "$(shell ${TARGET_CPP} -print-file-name=libmingwex.a)" " );
    	
    	/* hack to get libgcc_eh.a, should check mingw version or something */
    	if (Environment::GetArch() == "amd64")