diff options
| author | Antti Määttä <antti.maatta@qt.io> | 2019-06-11 10:01:24 +0300 |
|---|---|---|
| committer | Antti Määttä <antti.maatta@qt.io> | 2019-06-11 12:18:28 +0300 |
| commit | a06fe056604b38d52ebca44d52b87f736b483649 (patch) | |
| tree | 5b9850e93458b78474cad8149c034d0bdf82a408 /src/ogl-runtime-dylib | |
| parent | 17be624891943ef0f0fd24bf11cb0db23e142878 (diff) | |
Fix editor build on mingw
Task-number: QT3DS-3659
Change-Id: Ie3f4f9fd6712f858942e9c294a49af2b561bbd77
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/ogl-runtime-dylib')
| -rw-r--r-- | src/ogl-runtime-dylib/ogl-runtime-dylib.pro | 16 |
1 files changed, 12 insertions, 4 deletions
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 { |