diff options
-rw-r--r-- | src/api/studio3d/studio3d.pro | 6 | ||||
-rw-r--r-- | src/api/studio3dqml/studio3dqml.pro | 6 | ||||
-rw-r--r-- | src/dm/dm.pro | 4 | ||||
-rw-r--r-- | src/ogl-runtime-dylib/ogl-runtime-dylib.pro | 6 | ||||
-rw-r--r-- | src/ogl-runtime-static/ogl-runtime-static.pro | 6 | ||||
-rw-r--r-- | src/qmlstreamer/qmlstreamer.pro | 6 | ||||
-rw-r--r-- | tools/viewer/viewer.pro | 13 |
7 files changed, 47 insertions, 0 deletions
diff --git a/src/api/studio3d/studio3d.pro b/src/api/studio3d/studio3d.pro index f0cd874..cfa8b71 100644 --- a/src/api/studio3d/studio3d.pro +++ b/src/api/studio3d/studio3d.pro @@ -65,3 +65,9 @@ SOURCES += \ ../../foundation/qt/formatdiscovery.cpp load(qt_module) + +android { + # qt prl files contain hard coded paths to android ndk so don't link against them + # If libraries are missing because of this they need to be added separately + CONFIG -= link_prl +} diff --git a/src/api/studio3dqml/studio3dqml.pro b/src/api/studio3dqml/studio3dqml.pro index df685fc..ac7f03d 100644 --- a/src/api/studio3dqml/studio3dqml.pro +++ b/src/api/studio3dqml/studio3dqml.pro @@ -34,3 +34,9 @@ OTHER_FILES += \ qmldir load(qml_plugin) + +android { + # qt prl files contain hard coded paths to android ndk so don't link against them + # If libraries are missing because of this they need to be added separately + CONFIG -= link_prl +} diff --git a/src/dm/dm.pro b/src/dm/dm.pro index 2e57f30..af4a846 100644 --- a/src/dm/dm.pro +++ b/src/dm/dm.pro @@ -56,3 +56,7 @@ HEADERS += \ systems/Qt3DSDMMetaDataValue.h \ systems/Qt3DSDMMetaData.h \ systems/Qt3DSDMWStrOpsImpl.h + +android { + CONFIG -= link_prl +} diff --git a/src/ogl-runtime-dylib/ogl-runtime-dylib.pro b/src/ogl-runtime-dylib/ogl-runtime-dylib.pro index 264830f..b360205 100644 --- a/src/ogl-runtime-dylib/ogl-runtime-dylib.pro +++ b/src/ogl-runtime-dylib/ogl-runtime-dylib.pro @@ -80,3 +80,9 @@ PREDEPS_LIBS = qt3dsruntimestatic include(../../utils.pri) PRE_TARGETDEPS += $$fixLibPredeps($$LIBDIR, PREDEPS_LIBS) + +android { + # qt prl files contain hard coded paths to android ndk so don't link against them + # If libraries are missing because of this they need to be added separately + CONFIG -= link_prl +} diff --git a/src/ogl-runtime-static/ogl-runtime-static.pro b/src/ogl-runtime-static/ogl-runtime-static.pro index ca90711..85d8491 100644 --- a/src/ogl-runtime-static/ogl-runtime-static.pro +++ b/src/ogl-runtime-static/ogl-runtime-static.pro @@ -660,3 +660,9 @@ HEADERS += \ DISTFILES += \ ../runtime/Qt3DSAttributeHashes.txt + +android { + # qt prl files contain hard coded paths to android ndk so don't link against them + # If libraries are missing because of this they need to be added separately + CONFIG -= link_prl +} diff --git a/src/qmlstreamer/qmlstreamer.pro b/src/qmlstreamer/qmlstreamer.pro index 5e82c7c..09c42d8 100644 --- a/src/qmlstreamer/qmlstreamer.pro +++ b/src/qmlstreamer/qmlstreamer.pro @@ -48,3 +48,9 @@ INCLUDEPATH += \ $$PWD/../QtExtras/qmlstreamer macos:QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/ + +android { + # qt prl files contain hard coded paths to android ndk so don't link against them + # If libraries are missing because of this they need to be added separately + CONFIG -= link_prl +} diff --git a/tools/viewer/viewer.pro b/tools/viewer/viewer.pro index fc750b7..64f58ed 100644 --- a/tools/viewer/viewer.pro +++ b/tools/viewer/viewer.pro @@ -46,9 +46,11 @@ HEADERS += \ $$PWD/../../src/api/studio3d/q3dsdatainput.h } +!android { LIBS += \ -lqt3dsopengl$$qtPlatformTargetSuffix() \ -lqt3dsqmlstreamer$$qtPlatformTargetSuffix() +} macos:QMAKE_RPATHDIR += @executable_path/../../../../lib @@ -73,3 +75,14 @@ contains(ANDROID_TARGET_ARCH,arm64-v8a) { ANDROID_PACKAGE_SOURCE_DIR = \ $$PWD/android } + +android { + # qt prl files contain hard coded paths to android ndk so don't link against them + # If libraries are missing because of this they need to be added separately + CONFIG -= link_prl + LIBS += \ + $$OUT_PWD/../../lib/libqt3dsopengl$$qtPlatformTargetSuffix().so \ + $$OUT_PWD/../../lib/libqt3dsqmlstreamer$$qtPlatformTargetSuffix().so + + QT += quick +} |