Sync to trunk head (r42241)

[reactos.git] / reactos / tools / rbuild / backend / mingw / mingw.cpp

diff --git a/reactos/tools/rbuild/backend/mingw/mingw.cpp b/reactos/tools/rbuild/backend/mingw/mingw.cpp
index dc0727d..afef39a 100644 (file)
--- a/reactos/tools/rbuild/backend/mingw/mingw.cpp
+++ b/reactos/tools/rbuild/backend/mingw/mingw.cpp
@@ -455,9 +455,8 @@ MingwBackend::GenerateGlobalVariables () const
 
        if ( ProjectNode.configuration.Compiler == GnuGcc )
        {
-               fprintf ( fMakefile, "PROJECT_CFLAGS += -Wall\n" );
-               fprintf ( fMakefile, "PROJECT_CXXFLAGS += -Wall\n" );
                fprintf ( fMakefile, "ifneq ($(OARCH),)\n" );
+               fprintf ( fMakefile, "PROJECT_ASFLAGS += -march=$(OARCH)\n" );
                fprintf ( fMakefile, "PROJECT_CFLAGS += -march=$(OARCH)\n" );
                fprintf ( fMakefile, "PROJECT_CXXFLAGS += -march=$(OARCH)\n" );
                fprintf ( fMakefile, "endif\n" );
@@ -466,10 +465,6 @@ MingwBackend::GenerateGlobalVariables () const
                fprintf ( fMakefile, "PROJECT_CXXFLAGS += -mtune=$(TUNE)\n" );
                fprintf ( fMakefile, "endif\n" );
 
-               fprintf ( fMakefile, "PROJECT_CFLAGS += -g%s\n", Environment::GetArch() == "amd64" ? "dwarf-2" : "stabs+" );
-               fprintf ( fMakefile, "PROJECT_CXXFLAGS += -g%s\n", Environment::GetArch() == "amd64" ? "dwarf-2" : "stabs+" );
-               fprintf ( fMakefile, "PROJECT_ASFLAGS += -g%s\n", Environment::GetArch() == "amd64" ? "dwarf-2" : "stabs+" );
-
                if ( usePipe )
                {
                        fprintf ( fMakefile, "PROJECT_CFLAGS += -pipe\n" );
@@ -491,7 +486,7 @@ MingwBackend::GenerateGlobalVariables () const
 
        // TODO: linker flags
        fprintf ( fMakefile, "PROJECT_LFLAGS := '$(shell ${TARGET_CC} -print-libgcc-file-name)' %s\n", GenerateProjectLFLAGS ().c_str () );
-       fprintf ( fMakefile, "PROJECT_LPPFLAGS := '$(shell ${TARGET_CPP} -print-file-name=libstdc++.a)' '$(shell ${TARGET_CPP} -print-file-name=libgcc.a)' '$(shell ${TARGET_CPP} -print-file-name=libmingw32.a)' '$(shell ${TARGET_CPP} -print-file-name=libmingwex.a)' '$(shell ${TARGET_CPP} -print-file-name=libcoldname.a)'\n" );
+       fprintf ( fMakefile, "PROJECT_LPPFLAGS := '$(shell ${TARGET_CPP} -print-file-name=libstdc++.a)' '$(shell ${TARGET_CPP} -print-file-name=libgcc.a)' '$(shell ${TARGET_CPP} -print-file-name=libmingw32.a)' '$(shell ${TARGET_CPP} -print-file-name=libmingwex.a)'\n" );
        /* hack to get libgcc_eh.a, should check mingw version or something */
        if (Environment::GetArch() == "amd64")
        {
@@ -505,7 +500,7 @@ MingwBackend::GenerateGlobalVariables () const
                {
                                fprintf ( fMakefile,
                                                  "MODULETYPE%d_%sFLAGS:=%s\n",
-                                                 i,
+                                                 (int)i,
                                                  "C",
                                                  ModuleHandlerInformations[i].cflags );
                }
@@ -514,7 +509,7 @@ MingwBackend::GenerateGlobalVariables () const
                {
                                fprintf ( fMakefile,
                                                  "MODULETYPE%d_%sFLAGS:=%s\n",
-                                                 i,
+                                                 (int)i,
                                                  "CXX",
                                                  ModuleHandlerInformations[i].cflags );
                }
@@ -523,7 +518,7 @@ MingwBackend::GenerateGlobalVariables () const
                {
                                fprintf ( fMakefile,
                                                  "MODULETYPE%d_%sFLAGS:=%s\n",
-                                                 i,
+                                                 (int)i,
                                                  "NASM",
                                                  ModuleHandlerInformations[i].nasmflags );
                }