configure: Appending compiler and linker flags...

...instead of overwriting when building qmake for windows. Change-Id: I89eb33439b03a0ad33d006d12c9896c87d271c4f Reviewed-by: Oswald Buddenhagen <[email protected]>
RawnHelly · Mar 23, 2016 · d3d78c8 · d3d78c8
1 parent 7565b73
commit d3d78c8
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/configure b/configure
@@ -4042,8 +4042,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
             done
         fi
         if [ "$BUILD_ON_MSYS" = "yes" ]; then
-            EXTRA_CFLAGS="-DUNICODE"
-            EXTRA_CXXFLAGS="-DUNICODE"
+            EXTRA_CFLAGS="$EXTRA_CFLAGS -DUNICODE"
+            EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -DUNICODE"
             EXTRA_OBJS="qfilesystemengine_win.o \
                         qfilesystemiterator_win.o \
                         qfsfileengine_win.o \
@@ -4058,7 +4058,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
                         \"\$(SOURCE_PATH)/src/corelib/tools/qlocale_win.cpp\" \
                         \"\$(SOURCE_PATH)/src/corelib/plugin/qsystemlibrary.cpp\" \
                         \"\$(SOURCE_PATH)/tools/shared/windows/registry.cpp\""
-            EXTRA_LFLAGS="-static -s -lole32 -luuid -ladvapi32 -lkernel32"
+            EXTRA_LFLAGS="$EXTRA_LFLAGS -static -s -lole32 -luuid -ladvapi32 -lkernel32"
             EXEEXT=".exe"
         else
             EXTRA_OBJS="qfilesystemengine_unix.o \