diff options
author | Janne Koskinen <janne.p.koskinen@qt.io> | 2017-11-06 11:29:41 +0200 |
---|---|---|
committer | Janne Koskinen <janne.p.koskinen@qt.io> | 2017-11-06 14:02:43 +0000 |
commit | 2adaeb2688673d007e822b8fe229f795c2e3f78f (patch) | |
tree | 6c8b5c2b4ba7aa3d9f8d9dc3cc76c3fa08655f9d /src | |
parent | 6e30dc17027a2f9aaccddcff72cbd2690bbb1f22 (diff) |
Add QNX runtime build
Source and compiler options selection.
Change-Id: I73e08cd49e898b7320626670b009a8b41655f3b9
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/3rdparty/3rdparty.pro | 2 | ||||
-rw-r--r-- | src/Authoring/CoreLib/CoreLib.pro | 2 | ||||
-rw-r--r-- | src/Runtime/Qt3DSRuntime/Qt3DSRuntime.pro | 2 | ||||
-rw-r--r-- | src/Runtime/commoninclude.pri | 2 | ||||
-rw-r--r-- | src/Viewer/Viewer.pro | 2 | ||||
-rw-r--r-- | src/commonplatform.pri | 4 | ||||
-rw-r--r-- | src/src.pro | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/src/3rdparty/3rdparty.pro b/src/3rdparty/3rdparty.pro index 2fbb3332..b40d274d 100644 --- a/src/3rdparty/3rdparty.pro +++ b/src/3rdparty/3rdparty.pro @@ -4,7 +4,7 @@ SUBDIRS += \ Lua \ EASTL -!boot2qt:!android:!integrity { +!boot2qt:!android:!integrity:!qnx { SUBDIRS += \ pcre \ ColladaDOM/TinyXML \ diff --git a/src/Authoring/CoreLib/CoreLib.pro b/src/Authoring/CoreLib/CoreLib.pro index cf1952af..519bbe93 100644 --- a/src/Authoring/CoreLib/CoreLib.pro +++ b/src/Authoring/CoreLib/CoreLib.pro @@ -14,7 +14,7 @@ QT += widgets macos:DEFINES += WIDE_IS_DIFFERENT_TYPE_THAN_CHAR16_T QT3DS_LITTLE_ENDIAN -linux: DEFINES += WIDE_IS_DIFFERENT_TYPE_THAN_CHAR16_T +linux|qnx: DEFINES += WIDE_IS_DIFFERENT_TYPE_THAN_CHAR16_T INCLUDEPATH += \ ../Client/Code/Core \ diff --git a/src/Runtime/Qt3DSRuntime/Qt3DSRuntime.pro b/src/Runtime/Qt3DSRuntime/Qt3DSRuntime.pro index 1ad14595..d19bcd34 100644 --- a/src/Runtime/Qt3DSRuntime/Qt3DSRuntime.pro +++ b/src/Runtime/Qt3DSRuntime/Qt3DSRuntime.pro @@ -26,7 +26,7 @@ HEADERS += \ ../Source/Viewer/Qt3DSViewerApp.h \ ../Source/Viewer/Qt3DSViewerTimer.h -linux { +linux|qnx { BEGIN_ARCHIVE = -Wl,--whole-archive END_ARCHIVE = -Wl,--no-whole-archive } diff --git a/src/Runtime/commoninclude.pri b/src/Runtime/commoninclude.pri index 67c76d56..7b323e57 100644 --- a/src/Runtime/commoninclude.pri +++ b/src/Runtime/commoninclude.pri @@ -55,7 +55,7 @@ INCLUDEPATH += \ $$PWD/../3rdparty/RuntimePlatformSpecific/Windows/Qt3DSLibs } -linux { +linux|qnx { QMAKE_CXXFLAGS += -fpermissive QMAKE_CFLAGS += -fpermissive INCLUDEPATH += \ diff --git a/src/Viewer/Viewer.pro b/src/Viewer/Viewer.pro index 66a20a99..07bdb7ad 100644 --- a/src/Viewer/Viewer.pro +++ b/src/Viewer/Viewer.pro @@ -4,6 +4,6 @@ SUBDIRS += \ studio3d \ qmlviewer -!boot2qt:!integrity { +!boot2qt:!integrity:!qnx { SUBDIRS += Qt3DViewer } diff --git a/src/commonplatform.pri b/src/commonplatform.pri index 13947f31..3201e892 100644 --- a/src/commonplatform.pri +++ b/src/commonplatform.pri @@ -19,7 +19,7 @@ DEFINES += \ win32: PlatformSpecificDir = Windows macos: PlatformSpecificDir = Macos -linux|integrity: PlatformSpecificDir = Linux +linux|integrity|qnx: PlatformSpecificDir = Linux android: PlatformSpecificDir = Android/jni integrity: { @@ -44,7 +44,7 @@ CONFIG(debug, debug|release) { DEFINES += NDEBUG } -linux { +linux|qnx { CONFIG += egl DEFINES+=_LINUX QT3DS_OS_LINUX _LINUXPLATFORM QT3DS_NO_X11 \ QT3DS_VIEWER_EXPORTS WIDE_IS_DIFFERENT_TYPE_THAN_CHAR16_T diff --git a/src/src.pro b/src/src.pro index a7162708..75f527b4 100644 --- a/src/src.pro +++ b/src/src.pro @@ -6,6 +6,6 @@ SUBDIRS += \ Runtime \ Viewer -!boot2qt:!android:!integrity { +!boot2qt:!android:!integrity:!qnx { SUBDIRS += Authoring } |