From 5865baabbf4b4933fadd927e447ed56c7a2eb31d Mon Sep 17 00:00:00 2001 From: MWM Planet Generator cdn3 Date: Thu, 5 Mar 2015 03:48:18 -0800 Subject: [PATCH] [linux] Pass correct flags to clang on linux & warning fix --- common.pri | 9 +++++---- generator/generator.pro | 1 - 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common.pri b/common.pri index b888327ed0..bf69856499 100644 --- a/common.pri +++ b/common.pri @@ -147,13 +147,14 @@ tizen{ } -linux-g++* { +linux-* { QMAKE_CFLAGS *= -fdata-sections -ffunction-sections QMAKE_CXXFLAGS *= -fdata-sections -ffunction-sections QMAKE_LFLAGS *= -Wl,--gc-sections -Wl,-Bsymbolic-functions - QMAKE_CFLAGS_RELEASE *= -ffloat-store - QMAKE_CXXFLAGS_RELEASE *= -ffloat-store - + linux-g++* { + QMAKE_CFLAGS_RELEASE *= -ffloat-store + QMAKE_CXXFLAGS_RELEASE *= -ffloat-store + } # debian build requirements CONFIG(production) { QMAKE_CFLAGS_RELEASE = -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security diff --git a/generator/generator.pro b/generator/generator.pro index 711f292870..88fce5be2f 100644 --- a/generator/generator.pro +++ b/generator/generator.pro @@ -39,7 +39,6 @@ HEADERS += \ feature_merger.hpp \ xml_element.hpp \ osm_element.hpp \ - data_generator.hpp \ feature_generator.hpp \ first_pass_parser.hpp \ data_cache_file.hpp \