Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | configure: support c++0x standard for directfd |
| 2 | |
| 3 | While directfd upgrade to 1.7.6, it always includes directfb++ utils |
| 4 | when C++ is used and set c++0x as c++ standard. |
| 5 | (In git://git.directfb.org/git/directfb/core/DirectFB.git |
| 6 | commit b444bcae3197be9faf883460dcc239ef757d5922, and commit |
| 7 | 522beeb76f2a8d2dee30d928d2a5955bd06cf25c) |
| 8 | |
| 9 | The directfd in qt4 is c++, and there was a build failure: |
| 10 | ... |
| 11 | | qdirectfbwindowsurface.cpp:336:69: error: in C++98 'rect' must be |
| 12 | initialized by constructor, not by '{...}' |
| 13 | | const DFBRectangle rect = { r.x(), r.y(), r.width(), r.height() }; |
| 14 | ... |
| 15 | |
| 16 | The g++ used c++98 as default c++ standard, we should |
| 17 | explicitly set c++0x for directfd in qt4. |
| 18 | |
| 19 | Upstream-Status: Pending |
| 20 | |
| 21 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 22 | --- |
| 23 | configure | 1 + |
| 24 | 1 file changed, 1 insertion(+) |
| 25 | |
| 26 | diff --git a/configure b/configure |
| 27 | index 5724bd6..ecc2f8b 100755 |
| 28 | --- a/configure |
| 29 | +++ b/configure |
| 30 | @@ -6656,6 +6656,7 @@ if [ "$PLATFORM_QWS" = "yes" ]; then |
| 31 | if [ "${screen}" = "directfb" ] && [ "${CFG_CONFIGURE_EXIT_ON_ERROR}" = "yes" ]; then |
| 32 | if test -n "$PKG_CONFIG" && "$PKG_CONFIG" --exists directfb 2>/dev/null; then |
| 33 | QT_CFLAGS_DIRECTFB=`$PKG_CONFIG --cflags directfb 2>/dev/null` |
| 34 | + QT_CFLAGS_DIRECTFB="$QT_CFLAGS_DIRECTFB -std=c++0x" |
| 35 | QT_LIBS_DIRECTFB=`$PKG_CONFIG --libs directfb 2>/dev/null` |
| 36 | elif directfb-config --version >/dev/null 2>&1; then |
| 37 | QT_CFLAGS_DIRECTFB=`directfb-config --cflags 2>/dev/null` |
| 38 | -- |
| 39 | 1.9.1 |
| 40 | |