107 lines
3.8 KiB
Diff
107 lines
3.8 KiB
Diff
From ccccd985256ed81a2bc56ee938c049f596639f11 Mon Sep 17 00:00:00 2001
|
|
From: Alexey Pavlov <alexpux@gmail.com>
|
|
Date: Tue, 5 Dec 2017 13:45:54 +0300
|
|
Subject: [PATCH] Fix building Qt3DStudio with mingw
|
|
|
|
---
|
|
src/Authoring/Client/Code/Core/Utility/cpuid.h | 1 +
|
|
src/Authoring/Studio/Qt3DStudio.pro | 8 ++++----
|
|
src/Runtime/Qt3DSCompiler/Qt3DSCompiler.pro | 2 +-
|
|
src/Runtime/Qt3DSRuntime/Qt3DSRuntime.pro | 2 +-
|
|
src/commonplatform.pri | 1 +
|
|
src/src.pro | 2 +-
|
|
6 files changed, 9 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/src/Authoring/Client/Code/Core/Utility/cpuid.h b/src/Authoring/Client/Code/Core/Utility/cpuid.h
|
|
index 9a48731..b9c69e4 100644
|
|
--- a/src/Authoring/Client/Code/Core/Utility/cpuid.h
|
|
+++ b/src/Authoring/Client/Code/Core/Utility/cpuid.h
|
|
@@ -40,6 +40,7 @@
|
|
#define _MAX_VNAME_LEN 13
|
|
#define _MAX_MNAME_LEN 30
|
|
|
|
+#include <intrin.h>
|
|
// Added by PB
|
|
// MSDN Code to detect processor and OS capabilities. From CPUID code example.
|
|
// http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vcsample/html/vcsamcpuiddeterminecpucapabilities.asp
|
|
diff --git a/src/Authoring/Studio/Qt3DStudio.pro b/src/Authoring/Studio/Qt3DStudio.pro
|
|
index c7e31af..e6f49b4 100644
|
|
--- a/src/Authoring/Studio/Qt3DStudio.pro
|
|
+++ b/src/Authoring/Studio/Qt3DStudio.pro
|
|
@@ -8,9 +8,8 @@ CONFIG += nostrictstrings
|
|
|
|
DEFINES += _UNICODE UNICODE QT3DS_AUTHORING _AFXDLL \
|
|
PCRE_STATIC EASTL_MINMAX_ENABLED=0 \
|
|
- EASTL_NOMINMAX=0 DOM_DYNAMIC DRIVE_DESIGN_STUDIO
|
|
-
|
|
-win: QMAKE_LFLAGS += /MANIFEST /ENTRY:"wWinMainCRTStartup"
|
|
+ EASTL_NOMINMAX=0 DRIVE_DESIGN_STUDIO
|
|
+win:!mingw: QMAKE_LFLAGS += /MANIFEST /ENTRY:"wWinMainCRTStartup"
|
|
|
|
QT += core gui openglextensions
|
|
QT += qml quick widgets quickwidgets network
|
|
@@ -77,7 +77,7 @@ INCLUDEPATH += \
|
|
../../3rdparty/EASTL/UnknownVersion/include \
|
|
../../3rdparty/color
|
|
|
|
-linux {
|
|
+linux|mingw {
|
|
BEGIN_ARCHIVE = -Wl,--whole-archive
|
|
END_ARCHIVE = -Wl,--no-whole-archive
|
|
}
|
|
diff --git a/src/Runtime/Qt3DSCompiler/Qt3DSCompiler.pro b/src/Runtime/Qt3DSCompiler/Qt3DSCompiler.pro
|
|
index d88fa6c..fe5a84e 100644
|
|
--- a/src/Runtime/Qt3DSCompiler/Qt3DSCompiler.pro
|
|
+++ b/src/Runtime/Qt3DSCompiler/Qt3DSCompiler.pro
|
|
@@ -22,8 +22,8 @@ integrity:ios {
|
|
STATICRUNTIME = \
|
|
$$BEGIN_ARCHIVE \
|
|
-lqt3dsruntimestatic$$qtPlatformTargetSuffix() \
|
|
- -lEASTL$$qtPlatformTargetSuffix() \
|
|
-lLua$$qtPlatformTargetSuffix() \
|
|
+ -lEASTL$$qtPlatformTargetSuffix() \
|
|
$$END_ARCHIVE
|
|
|
|
# On non-windows systems link the whole static archives and do not put them
|
|
diff --git a/src/Runtime/Qt3DSRuntime/Qt3DSRuntime.pro b/src/Runtime/Qt3DSRuntime/Qt3DSRuntime.pro
|
|
index 01d632e..b44813b 100644
|
|
--- a/src/Runtime/Qt3DSRuntime/Qt3DSRuntime.pro
|
|
+++ b/src/Runtime/Qt3DSRuntime/Qt3DSRuntime.pro
|
|
@@ -34,8 +34,8 @@ linux|qnx|mingw {
|
|
STATICRUNTIME = \
|
|
$$BEGIN_ARCHIVE \
|
|
-lqt3dsruntimestatic$$qtPlatformTargetSuffix() \
|
|
- -lEASTL$$qtPlatformTargetSuffix() \
|
|
-lLua$$qtPlatformTargetSuffix() \
|
|
+ -lEASTL$$qtPlatformTargetSuffix() \
|
|
$$END_ARCHIVE
|
|
|
|
# On non-windows systems link the whole static archives and do not put them
|
|
diff --git a/src/commonplatform.pri b/src/commonplatform.pri
|
|
index d898476..37c4b72 100644
|
|
--- a/src/commonplatform.pri
|
|
+++ b/src/commonplatform.pri
|
|
@@ -78,6 +78,6 @@ android {
|
|
win32 {
|
|
DEFINES += QT3DS_OS_WINDOWS _WIN32 _PCPLATFORM \
|
|
- WIDE_IS_DIFFERENT_TYPE_THAN_CHAR16_T LUA_BUILD_AS_DLL KDWIN NOMINMAX
|
|
+ WIDE_IS_DIFFERENT_TYPE_THAN_CHAR16_T KDWIN NOMINMAX
|
|
|
|
win32-msvc {
|
|
QMAKE_CXXFLAGS += /MP /d2Zi+
|
|
diff --git a/src/src.pro b/src/src.pro
|
|
index 85aca0d..2481f79 100644
|
|
--- a/src/src.pro
|
|
+++ b/src/src.pro
|
|
@@ -6,6 +6,6 @@ SUBDIRS += \
|
|
Runtime \
|
|
Viewer
|
|
|
|
-!cross_compile:!qnx:!mingw {
|
|
+!cross_compile:!qnx {
|
|
SUBDIRS += Authoring
|
|
}
|
|
--
|
|
2.15.0
|
|
|