mnalis/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[tizen] After review.

Browse source
This commit is contained in:
Sergey Pisarchik 2014-03-27 19:36:27 +03:00 • committed by Alex Zolotarev
parent c811dd475a
commit 29871128cd
4 changed files with 23 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common.pri
View file

@ -48,7 +48,7 @@ win32-msvc*|symbian {
LIB_EXT = .lib
LIB_PREFIX =
}
unix|win32-g++|tizen {
unix|win32-g++|tizen* {
LIB_EXT = .a
LIB_PREFIX = lib
}

4
graphics/graphics.pro
View file

@ -10,9 +10,7 @@ ROOT_DIR = ..
INCLUDEPATH += $$ROOT_DIR/3party/freetype/include $$ROOT_DIR/3party/agg
# use expat from the system on linux
# TODO FIX CORRECTLY!!!!
#!linux*: INCLUDEPATH *= ../3party/expat/lib
INCLUDEPATH *= ../3party/expat/lib
!linux*: INCLUDEPATH *= ../3party/expat/lib
include($$ROOT_DIR/common.pri)

3
map/map.pro
View file

@ -9,8 +9,7 @@ ROOT_DIR = ..
INCLUDEPATH *= $$ROOT_DIR/3party/protobuf/src
# use expat from the system on linux
#!linux*: INCLUDEPATH *= $$ROOT_DIR/3party/expat/lib
# TODO fix correctly for TIZEN
!linux*: INCLUDEPATH *= $$ROOT_DIR/3party/expat/lib
INCLUDEPATH *= $$ROOT_DIR/3party/expat/lib

40
tools/mkspecs/tizen-simulator/qmake.conf
View file

@ -1,17 +1,17 @@
#From file/Users/Sergey/GitHub/qtbase/mkspecs/devices/linux-g++-tizen/qmake.conf
#From file /qtbase/mkspecs/devices/linux-g++-tizen/qmake.conf
#Tizen spec
#From file/Users/Sergey/GitHub/qtbase/mkspecs/devices/common/linux_tizen_device_pre.conf
#From file /qtbase/mkspecs/devices/common/linux_tizen_device_pre.conf
#tizen common mkspec
#From file/Users/Sergey/GitHub/qtbase/mkspecs/devices/common/linux_device_pre.conf
#From file /qtbase/mkspecs/devices/common/linux_device_pre.conf
QT_QPA_DEFAULT_PLATFORM = eglfs
MAKEFILE_GENERATOR = UNIX
CONFIG += incremental
QMAKE_INCREMENTAL_STYLE = sublib
#From file/Users/Sergey/GitHub/qtbase/mkspecs/common/linux.conf
#From file /qtbase/mkspecs/common/linux.conf
#
# qmake configuration for common linux
#
@ -70,7 +70,7 @@ QMAKE_STRIPFLAGS_LIB += --strip-unneeded
QMAKE_INSTALL_FILE = install -m 644 -p
QMAKE_INSTALL_PROGRAM = install -m 755 -p
#From file/Users/Sergey/GitHub/qtbase/mkspecs/common/unix.conf
#From file /qtbase/mkspecs/common/unix.conf
#
# qmake configuration for common unix
#
@ -88,7 +88,7 @@ QMAKE_PREFIX_SHLIB = lib
QMAKE_PREFIX_STATICLIB = lib
QMAKE_EXTENSION_STATICLIB = a
#From file/Users/Sergey/GitHub/qtbase/mkspecs/common/shell-unix.conf
#From file /qtbase/mkspecs/common/shell-unix.conf
QMAKE_TAR = tar -cf
QMAKE_GZIP = gzip -9f
@ -103,10 +103,10 @@ QMAKE_CHK_DIR_EXISTS = test -d # legacy
QMAKE_MKDIR = mkdir -p # legacy
QMAKE_MKDIR_CMD = test -d %1 || mkdir -p %1
QMAKE_STREAM_EDITOR = sed
#End from file/Users/Sergey/GitHub/qtbase/mkspecs/common/shell-unix.conf
#End from file/Users/Sergey/GitHub/qtbase/mkspecs/common/unix.conf
#End from file/Users/Sergey/GitHub/qtbase/mkspecs/common/linux.conf
#From file/Users/Sergey/GitHub/qtbase/mkspecs/common/gcc-base-unix.conf
#End of file /qtbase/mkspecs/common/shell-unix.conf
#End of file /qtbase/mkspecs/common/unix.conf
#End of file /qtbase/mkspecs/common/linux.conf
#From file /qtbase/mkspecs/common/gcc-base-unix.conf
#
# Base qmake configuration for GCC on *nix-systems
#
@ -117,7 +117,7 @@ QMAKE_STREAM_EDITOR = sed
# you can use the manual test in tests/manual/mkspecs.
#
#From file/Users/Sergey/GitHub/qtbase/mkspecs/common/gcc-base.conf
#From file /qtbase/mkspecs/common/gcc-base.conf
#
# This file is used as a basis for the following compilers:
#
@ -196,7 +196,7 @@ QMAKE_CFLAGS_AVX += -mavx
QMAKE_CFLAGS_AVX2 += -mavx2
QMAKE_CFLAGS_IWMMXT += -mcpu=iwmmxt
QMAKE_CFLAGS_NEON += -mfpu=neon
#End from file/Users/Sergey/GitHub/qtbase/mkspecs/common/gcc-base.conf
#End of file /qtbase/mkspecs/common/gcc-base.conf
QMAKE_LFLAGS_SHLIB += -shared
QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB
@ -208,8 +208,8 @@ QMAKE_LFLAGS_RPATHLINK = -Wl,-rpath-link,
# -Bsymbolic-functions (ld) support
QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions
QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,
#End from file/Users/Sergey/GitHub/qtbase/mkspecs/common/gcc-base-unix.conf
#From file/Users/Sergey/GitHub/qtbase/mkspecs/common/g++-unix.conf
#End of file /qtbase/mkspecs/common/gcc-base-unix.conf
#From file /qtbase/mkspecs/common/g++-unix.conf
#
# Qmake configuration for the GNU C++ compiler on *nix-systems
#
@ -220,7 +220,7 @@ QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list,
# you can use the manual test in tests/manual/mkspecs.
#
#From file/Users/Sergey/GitHub/qtbase/mkspecs/common/g++-base.conf
#From file /qtbase/mkspecs/common/g++-base.conf
#
# Qmake configuration for the GNU C++ compiler
#
@ -256,11 +256,11 @@ QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
QMAKE_CXXFLAGS_CXX11 = -std=c++0x
QMAKE_LFLAGS_CXX11 =
#End from file/Users/Sergey/GitHub/qtbase/mkspecs/common/g++-base.conf
#End of file /qtbase/mkspecs/common/g++-base.conf
QMAKE_LFLAGS_RELEASE += -Wl,-O1
QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined
#End from file/Users/Sergey/GitHub/qtbase/mkspecs/common/g++-unix.conf
#End of file /qtbase/mkspecs/common/g++-unix.conf
!load(device_config) {
error(Could not successfully load device configuration)
@ -288,7 +288,7 @@ QMAKE_AR = $${CROSS_COMPILE}ar cqs
QMAKE_OBJCOPY = $${CROSS_COMPILE}objcopy
QMAKE_NM = $${CROSS_COMPILE}nm -P
QMAKE_STRIP = $${CROSS_COMPILE}strip
#End from file/Users/Sergey/GitHub/qtbase/mkspecs/devices/common/linux_device_pre.conf
#End of file /qtbase/mkspecs/devices/common/linux_device_pre.conf
!isEmpty(CROSS_COMPILE) {
QMAKE_INCDIR = $$[QT_SYSROOT]/usr/include
@ -299,7 +299,7 @@ QMAKE_STRIP = $${CROSS_COMPILE}strip
QMAKE_PLATFORM = tizen $$QMAKE_PLATFORM
DEFINES += Q_OS_LINUX_TIZEN
#End from file/Users/Sergey/GitHub/qtbase/mkspecs/devices/common/linux_tizen_device_pre.conf
#End of file /qtbase/mkspecs/devices/common/linux_tizen_device_pre.conf
contains(TIZEN_PROFILE, mobile) {
DEFINES += Q_OS_LINUX_TIZEN_MOBILE
@ -310,4 +310,4 @@ contains(TIZEN_PROFILE, mobile) {
}
load(qt_config)
#End from file/Users/Sergey/GitHub/qtbase/mkspecs/devices/linux-g++-tizen/qmake.conf
#End of file /qtbase/mkspecs/devices/linux-g++-tizen/qmake.conf