From ab21befe8cc280e5a54ec6a047ad19af01fd4852 Mon Sep 17 00:00:00 2001 From: Sergey Pisarchik Date: Wed, 18 Jun 2014 00:34:00 +0300 Subject: [PATCH] [Tizen] Add release configuration. Set -O1 flag instead -O3 because of compiler error. --- common.pri | 9 + tizen/MapsWithMe/.cproject | 315 ++++++++++++++----------- tools/mkspecs/common/tizen-common.conf | 8 +- tools/mkspecs/tizen-device/qmake.conf | 2 +- 4 files changed, 192 insertions(+), 142 deletions(-) diff --git a/common.pri b/common.pri index facd0c4c5b..66f534b1cc 100644 --- a/common.pri +++ b/common.pri @@ -115,12 +115,21 @@ unix|win32-g++ { QMAKE_CXXFLAGS_WARN_ON += -Wno-sign-conversion } +tizen{ + QMAKE_CFLAGS_RELEASE -= -O2 + QMAKE_CFLAGS_RELEASE += -O1 + QMAKE_CXXFLAGS_RELEASE -= -O2 + QMAKE_CXXFLAGS_RELEASE += -O1 + QMAKE_CFLAGS_RELEASE *= -ffast-math + QMAKE_CXXFLAGS_RELEASE *= -ffast-math +} else { QMAKE_CFLAGS_RELEASE -= -O2 QMAKE_CFLAGS_RELEASE += -O3 QMAKE_CXXFLAGS_RELEASE -= -O2 QMAKE_CXXFLAGS_RELEASE += -O3 QMAKE_CFLAGS_RELEASE *= -ffast-math QMAKE_CXXFLAGS_RELEASE *= -ffast-math +} } diff --git a/tizen/MapsWithMe/.cproject b/tizen/MapsWithMe/.cproject index 5db0752fee..639c4e0889 100644 --- a/tizen/MapsWithMe/.cproject +++ b/tizen/MapsWithMe/.cproject @@ -170,141 +170,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -621,15 +486,193 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -637,6 +680,4 @@ - - diff --git a/tools/mkspecs/common/tizen-common.conf b/tools/mkspecs/common/tizen-common.conf index 9dc75d6aa2..371b96894b 100644 --- a/tools/mkspecs/common/tizen-common.conf +++ b/tools/mkspecs/common/tizen-common.conf @@ -150,8 +150,8 @@ QMAKE_STREAM_EDITOR = sed # you can use the manual test in tests/manual/mkspecs. # -QMAKE_CFLAGS_OPTIMIZE = -O2 -QMAKE_CFLAGS_OPTIMIZE_FULL = -O3 +QMAKE_CFLAGS_OPTIMIZE = -O1 +QMAKE_CFLAGS_OPTIMIZE_FULL = -O1 QMAKE_CFLAGS += -pipe QMAKE_CFLAGS_DEPS += -M @@ -273,13 +273,13 @@ QMAKE_LINK = $${QMAKE_CXX} QMAKE_LINK_SHLIB = $${QMAKE_CXX} # TODO: fix paths -QMAKE_CFLAGS += -g -Wall -c --sysroot="$${TIZEN_SDK_PATH}/platforms/tizen2.2/rootstraps/tizen-emulator-2.2.native" +QMAKE_CFLAGS += -g -Wall -c --sysroot="$${TIZEN_SDK_PATH}/platforms/tizen2.2/rootstraps/tizen-device-2.2.native" QMAKE_CFLAGS += -I"$${TIZEN_PLATFORM_PATH}/usr/include" QMAKE_CFLAGS += -I"$${TIZEN_PLATFORM_PATH}/usr/include/osp" QMAKE_CFLAGS += -I"$${TIZEN_PLATFORM_PATH}/usr/include/libxml2" # TODO: fix paths -QMAKE_CFLAGS_RELEASE += -O3 +QMAKE_CFLAGS_RELEASE += -O1 QMAKE_CFLAGS_DEBUG += -O0 QMAKE_CFLAGS += $${TIZEN_QMAKE_CFLAGS} diff --git a/tools/mkspecs/tizen-device/qmake.conf b/tools/mkspecs/tizen-device/qmake.conf index 772002662e..9c8d7a3f9b 100644 --- a/tools/mkspecs/tizen-device/qmake.conf +++ b/tools/mkspecs/tizen-device/qmake.conf @@ -13,5 +13,5 @@ QMAKE_AR = $${TIZEN_SDK_PATH}/tools/arm-linux-gnueabi-gcc-4.5/b TIZEN_QMAKE_CFLAGS = -D_TIZEN_DEVICE TIZEN_QMAKE_CFLAGS += -fmessage-length=0 -target arm-tizen-linux-gnueabi -gcc-toolchain $${TIZEN_SDK_PATH}/tools/arm-linux-gnueabi-gcc-4.5/ TIZEN_QMAKE_CFLAGS += -ccc-gcc-name arm-linux-gnueabi-g++ -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mtune=cortex-a8 -Wno-gnu - +TIZEN_QMAKE_CFLAGS += -D_APP_LOG include(../common/tizen-common.conf)