From a06fe056604b38d52ebca44d52b87f736b483649 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20M=C3=A4=C3=A4tt=C3=A4?= Date: Tue, 11 Jun 2019 10:01:24 +0300 Subject: Fix editor build on mingw Task-number: QT3DS-3659 Change-Id: Ie3f4f9fd6712f858942e9c294a49af2b561bbd77 Reviewed-by: Miikka Heikkinen --- src/ogl-runtime-dylib/ogl-runtime-dylib.pro | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'src/ogl-runtime-dylib/ogl-runtime-dylib.pro') diff --git a/src/ogl-runtime-dylib/ogl-runtime-dylib.pro b/src/ogl-runtime-dylib/ogl-runtime-dylib.pro index 6cafa4c..264830f 100644 --- a/src/ogl-runtime-dylib/ogl-runtime-dylib.pro +++ b/src/ogl-runtime-dylib/ogl-runtime-dylib.pro @@ -28,7 +28,7 @@ HEADERS += \ ../viewer/Qt3DSViewerApp.h \ ../viewer/Qt3DSViewerTimer.h -linux|qnx|mingw { +linux|qnx { BEGIN_ARCHIVE = -Wl,--whole-archive END_ARCHIVE = -Wl,--no-whole-archive } @@ -46,9 +46,17 @@ STATICRUNTIME = \ QMAKE_LFLAGS += $$STATICRUNTIME LIBS += -lqt3dsqmlstreamer$$qtPlatformTargetSuffix() } else { - LIBS += \ - $$STATICRUNTIME \ - -lqt3dsqmlstreamer$$qtPlatformTargetSuffix() + mingw { + LIBS += \ + -lqt3dsruntimestatic$$qtPlatformTargetSuffix() \ + -lEASTL$$qtPlatformTargetSuffix() \ + -lQT3DSDM$$qtPlatformTargetSuffix() \ + -lqt3dsqmlstreamer$$qtPlatformTargetSuffix() + } else { + LIBS += \ + $$STATICRUNTIME \ + -lqt3dsqmlstreamer$$qtPlatformTargetSuffix() + } } win32 { -- cgit v1.2.3