From b7dc11b40c666704483049fef0059a637c8a8efa Mon Sep 17 00:00:00 2001 From: Bryant Date: Mon, 21 Jul 2014 23:47:22 -0700 Subject: [PATCH] Minor changes to build scripts. --- QGCSetup.pri | 2 +- qgroundcontrol.pro | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/QGCSetup.pri b/QGCSetup.pri index 9bff9089b..46bdebb66 100644 --- a/QGCSetup.pri +++ b/QGCSetup.pri @@ -17,7 +17,7 @@ # along with QGroundControl. If not, see . # ------------------------------------------------- -QMAKE_POST_LINK += $$quote(echo "Copying files") +QMAKE_POST_LINK += echo "Copying files" # # Copy the application resources to the associated place alongside the application diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro index b4477a772..4fef89807 100644 --- a/qgroundcontrol.pro +++ b/qgroundcontrol.pro @@ -140,13 +140,6 @@ WindowsBuild { QMAKE_CXXFLAGS_DEBUG += -MP QMAKE_CXXFLAGS_RELEASE += -MP - # Specify that the Unicode versions of string functions should be used in the Windows API. - # Without this the utils and qserialport libraries crash. - DEFINES += UNICODE - - # QWebkit is not needed on MS-Windows compilation environment - CONFIG -= webkit - RC_FILE = $$BASEDIR/qgroundcontrol.rc } @@ -176,7 +169,7 @@ WindowsBuild { } # -# Build flavor specific settings +# Build-specific settings # DebugBuild { @@ -187,7 +180,7 @@ ReleaseBuild { DEFINES += QT_NO_DEBUG WindowsBuild { - # Use link time code generation for beteer optimization (I believe this is supported in msvc express, but not 100% sure) + # Use link time code generation for better optimization (I believe this is supported in MSVC Express, but not 100% sure) QMAKE_LFLAGS_LTCG = /LTCG QMAKE_CFLAGS_LTCG = -GL } -- 2.22.0