1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
This file is part of MXE.
See index.html for further information.
From f38bd703f75e6cdf234ed8e99560bd65e4f775ea Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Fri, 17 Oct 2014 22:30:46 +0200
Subject: [PATCH] fix static linking
diff --git a/src/quick3d/quick3d.pro b/src/quick3d/quick3d.pro
index 03cdd28..5b8e2ef 100644
--- a/src/quick3d/quick3d.pro
+++ b/src/quick3d/quick3d.pro
@@ -9,7 +9,7 @@ gcov {
CONFIG += static
QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage
QMAKE_LFLAGS += -fprofile-arcs -ftest-coverage
-} else {
+} else:!static {
CONFIG += dll
}
diff --git a/src/threed/threed.pro b/src/threed/threed.pro
index cb5f1d1..8d2be9b 100644
--- a/src/threed/threed.pro
+++ b/src/threed/threed.pro
@@ -11,7 +11,7 @@ gcov {
CONFIG += static
QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage
QMAKE_LFLAGS += -fprofile-arcs -ftest-coverage
-} else {
+} else:!static {
CONFIG += dll
}
From: Boris Pek <tehnick-8@mail.ru>
Date: Wed, 04 May 2016 11:41:04 +0300
Subject: [PATCH] fix build with GCC >= 6.x
diff --git a/3rdparty/assimp/code/DXFLoader.cpp b/3rdparty/assimp/code/DXFLoader.cpp
index e372d60..2c1a13d 100644
--- a/3rdparty/assimp/code/DXFLoader.cpp
+++ b/3rdparty/assimp/code/DXFLoader.cpp
@@ -84,7 +84,7 @@
// ------------------------------------------------------------------------------------------------
// Constructor to be privately used by Importer
-DXFImporter::DXFImporter() : buffer(0), groupCode(0), bRepeat(false), mDefaultLayer(false)
+DXFImporter::DXFImporter() : buffer(0), groupCode(0), bRepeat(false)
{
memset(cursor,0,sizeof(cursor));
}
|
