diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2013-03-30 19:25:41 -0300 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2013-07-20 18:25:23 -0300 |
commit | edcd4a6659c281458423ed39586607d69b4bed2a (patch) | |
tree | 0b6271a48f5988ab8f6b250faf559b828d6b912b /recipes-qt | |
parent | d864d1c23886aa3accacde7a4008121a802d2129 (diff) | |
download | meta-fsl-arm-edcd4a6659c281458423ed39586607d69b4bed2a.tar.gz |
qt4: Enable OpenGL ES2 support for i.MX6
The Vivante libraries need some special linking as it has a more
modular design which thus require a specific set of mkspec changes to
make it to work. This change makes the linking to work when building
against Vivante libraries for i.MX6 SoCs.
Change-Id: I62a394876829fcd95933cb7351c8333b3bf78dcc
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-qt')
-rw-r--r-- | recipes-qt/qt4/qt4-embedded_4.8.5.bbappend | 5 | ||||
-rw-r--r-- | recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend | 5 | ||||
-rw-r--r-- | recipes-qt/qt4/qt4/mx6/g++.conf | 56 | ||||
-rw-r--r-- | recipes-qt/qt4/qt4/mx6/linux.conf | 66 |
4 files changed, 128 insertions, 4 deletions
diff --git a/recipes-qt/qt4/qt4-embedded_4.8.5.bbappend b/recipes-qt/qt4/qt4-embedded_4.8.5.bbappend index 74bfb31..4c4d0c9 100644 --- a/recipes-qt/qt4/qt4-embedded_4.8.5.bbappend +++ b/recipes-qt/qt4/qt4-embedded_4.8.5.bbappend | |||
@@ -9,6 +9,7 @@ PACKAGE_ARCH_mx5 = "${MACHINE_ARCH}" | |||
9 | QT_GLFLAGS_mx5 = "-opengl es2 -openvg" | 9 | QT_GLFLAGS_mx5 = "-opengl es2 -openvg" |
10 | QT_CONFIG_FLAGS_append_mx5 = " -I${STAGING_KERNEL_DIR}/include/" | 10 | QT_CONFIG_FLAGS_append_mx5 = " -I${STAGING_KERNEL_DIR}/include/" |
11 | 11 | ||
12 | DEPENDS_append_mx6 = " virtual/kernel" | 12 | DEPENDS_append_mx6 = " virtual/kernel virtual/libgles2" |
13 | PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}" | 13 | PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}" |
14 | QT_CONFIG_FLAGS_append_mx6 = " -I${STAGING_KERNEL_DIR}/include/" | 14 | QT_GLFLAGS_mx6 = "-opengl es2 -openvg" |
15 | QT_CONFIG_FLAGS_append_mx6 = " -I${STAGING_KERNEL_DIR}/include/ -DLINUX=1 -DEGL_API_FB=1" | ||
diff --git a/recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend b/recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend index 74bfb31..4c4d0c9 100644 --- a/recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend +++ b/recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend | |||
@@ -9,6 +9,7 @@ PACKAGE_ARCH_mx5 = "${MACHINE_ARCH}" | |||
9 | QT_GLFLAGS_mx5 = "-opengl es2 -openvg" | 9 | QT_GLFLAGS_mx5 = "-opengl es2 -openvg" |
10 | QT_CONFIG_FLAGS_append_mx5 = " -I${STAGING_KERNEL_DIR}/include/" | 10 | QT_CONFIG_FLAGS_append_mx5 = " -I${STAGING_KERNEL_DIR}/include/" |
11 | 11 | ||
12 | DEPENDS_append_mx6 = " virtual/kernel" | 12 | DEPENDS_append_mx6 = " virtual/kernel virtual/libgles2" |
13 | PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}" | 13 | PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}" |
14 | QT_CONFIG_FLAGS_append_mx6 = " -I${STAGING_KERNEL_DIR}/include/" | 14 | QT_GLFLAGS_mx6 = "-opengl es2 -openvg" |
15 | QT_CONFIG_FLAGS_append_mx6 = " -I${STAGING_KERNEL_DIR}/include/ -DLINUX=1 -DEGL_API_FB=1" | ||
diff --git a/recipes-qt/qt4/qt4/mx6/g++.conf b/recipes-qt/qt4/qt4/mx6/g++.conf new file mode 100644 index 0000000..4a4729e --- /dev/null +++ b/recipes-qt/qt4/qt4/mx6/g++.conf | |||
@@ -0,0 +1,56 @@ | |||
1 | # | ||
2 | # qmake configuration for common gcc | ||
3 | # | ||
4 | |||
5 | QMAKE_CC = $(OE_QMAKE_CC) | ||
6 | QMAKE_CFLAGS += -pipe $(OE_QMAKE_CFLAGS) -DLINUX=1 -DEGL_API_FB=1 | ||
7 | QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $(OE_QMAKE_CFLAGS) | ||
8 | QMAKE_CFLAGS_DEPS += -M | ||
9 | QMAKE_CFLAGS_WARN_ON += -Wall -W | ||
10 | QMAKE_CFLAGS_WARN_OFF += -w | ||
11 | QMAKE_CFLAGS_RELEASE += | ||
12 | QMAKE_CFLAGS_DEBUG += -g | ||
13 | QMAKE_CFLAGS_SHLIB += -fPIC | ||
14 | QMAKE_CFLAGS_STATIC_LIB += -fPIC | ||
15 | QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses | ||
16 | QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden | ||
17 | QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} | ||
18 | QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE} | ||
19 | |||
20 | QMAKE_CXX = $(OE_QMAKE_CXX) | ||
21 | QMAKE_CXXFLAGS += $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS) | ||
22 | QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS | ||
23 | QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON | ||
24 | QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF | ||
25 | QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_RELEASE | ||
26 | QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO | ||
27 | QMAKE_CXXFLAGS_DEBUG += $$QMAKE_CFLAGS_DEBUG | ||
28 | QMAKE_CXXFLAGS_SHLIB += $$QMAKE_CFLAGS_SHLIB | ||
29 | QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB | ||
30 | QMAKE_CXXFLAGS_YACC += $$QMAKE_CFLAGS_YACC | ||
31 | QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden | ||
32 | QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} | ||
33 | QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE | ||
34 | |||
35 | QMAKE_LINK = $(OE_QMAKE_LINK) | ||
36 | QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK) | ||
37 | QMAKE_LINK_C = $(OE_QMAKE_LINK) | ||
38 | QMAKE_LINK_C_SHLIB = $(OE_QMAKE_LINK) | ||
39 | QMAKE_LFLAGS += $(OE_QMAKE_LDFLAGS) | ||
40 | QMAKE_LFLAGS_RELEASE += | ||
41 | QMAKE_LFLAGS_DEBUG += | ||
42 | QMAKE_LFLAGS_APP += | ||
43 | QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined | ||
44 | QMAKE_LFLAGS_RPATH = -Wl,-rpath-link, | ||
45 | |||
46 | QMAKE_PCH_OUTPUT_EXT = .gch | ||
47 | |||
48 | # -Bsymbolic-functions (ld) support | ||
49 | QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions | ||
50 | QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list, | ||
51 | |||
52 | # some linking helper... | ||
53 | CONFIG += rpath_libdirs | ||
54 | |||
55 | # for the SDK | ||
56 | isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG) | ||
diff --git a/recipes-qt/qt4/qt4/mx6/linux.conf b/recipes-qt/qt4/qt4/mx6/linux.conf new file mode 100644 index 0000000..c644d8b --- /dev/null +++ b/recipes-qt/qt4/qt4/mx6/linux.conf | |||
@@ -0,0 +1,66 @@ | |||
1 | # | ||
2 | # qmake configuration for common linux | ||
3 | # | ||
4 | |||
5 | QMAKE_CFLAGS_THREAD += -D_REENTRANT | ||
6 | QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD | ||
7 | |||
8 | QMAKE_INCDIR = | ||
9 | QMAKE_LIBDIR = | ||
10 | QMAKE_INCDIR_X11 = | ||
11 | QMAKE_LIBDIR_X11 = | ||
12 | QMAKE_INCDIR_QT = $(OE_QMAKE_INCDIR_QT) | ||
13 | QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR_QT) | ||
14 | QMAKE_INCDIR_OPENGL = | ||
15 | QMAKE_LIBDIR_OPENGL = | ||
16 | QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL | ||
17 | QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL | ||
18 | QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL | ||
19 | QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL | ||
20 | QMAKE_INCDIR_EGL = | ||
21 | QMAKE_LIBDIR_EGL = | ||
22 | QMAKE_INCDIR_OPENVG = | ||
23 | QMAKE_LIBDIR_OPENVG = | ||
24 | |||
25 | |||
26 | QMAKE_LIBS = | ||
27 | QMAKE_LIBS_DYNLOAD = -ldl | ||
28 | QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11) | ||
29 | QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM) | ||
30 | QMAKE_LIBS_NIS = -lnsl | ||
31 | QMAKE_LIBS_EGL = -lEGL -lGAL -DLINUX=1 -DEGL_API_FB=1 | ||
32 | QMAKE_LIBS_OPENGL = -lGL | ||
33 | QMAKE_LIBS_OPENGL_QT = -lGL | ||
34 | QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM | ||
35 | QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 -lGAL -lEGL -DLINUX=1 -DEGL_API_FB=1 | ||
36 | QMAKE_LIBS_OPENVG = -lOpenVG -lGAL -lEGL -DLINUX=1 -DEGL_API_FB=1 | ||
37 | QMAKE_LIBS_THREAD = -lpthread | ||
38 | |||
39 | QMAKE_MOC = $(OE_QMAKE_MOC) | ||
40 | QMAKE_UIC = $(OE_QMAKE_UIC) | ||
41 | QMAKE_UIC3 = $(OE_QMAKE_UIC3) | ||
42 | QMAKE_RCC = $(OE_QMAKE_RCC) | ||
43 | QMAKE_QDBUSCPP2XML = $(OE_QMAKE_QDBUSCPP2XML) | ||
44 | QMAKE_QDBUSXML2CPP = $(OE_QMAKE_QDBUSXML2CPP) | ||
45 | |||
46 | QMAKE_AR = $(OE_QMAKE_AR) cqs | ||
47 | QMAKE_OBJCOPY = objcopy | ||
48 | QMAKE_RANLIB = | ||
49 | |||
50 | QMAKE_TAR = tar -cf | ||
51 | QMAKE_GZIP = gzip -9f | ||
52 | |||
53 | QMAKE_COPY = cp -f | ||
54 | QMAKE_COPY_FILE = $(COPY) | ||
55 | QMAKE_COPY_DIR = $(COPY) -r | ||
56 | QMAKE_MOVE = mv -f | ||
57 | QMAKE_DEL_FILE = rm -f | ||
58 | QMAKE_DEL_DIR = rmdir | ||
59 | QMAKE_STRIP = $(OE_QMAKE_STRIP) | ||
60 | QMAKE_STRIPFLAGS_LIB += --strip-unneeded | ||
61 | QMAKE_CHK_DIR_EXISTS = test -d | ||
62 | QMAKE_MKDIR = mkdir -p | ||
63 | QMAKE_INSTALL_FILE = install -m 644 -p | ||
64 | QMAKE_INSTALL_PROGRAM = install -m 755 -p | ||
65 | |||
66 | include(unix.conf) | ||