|
 |
7e0b93e |
diff -rupN shared.pri qcad-3.15.6.1-new/shared.pri
|
|
|
7e0b93e |
--- shared.pri 2016-12-01 10:40:01.000000000 +0100
|
|
|
7e0b93e |
+++ shared.pri 2016-12-18 21:03:22.059514509 +0100
|
|
|
7e0b93e |
@@ -164,10 +164,10 @@ QMAKE_TARGET_DESCRIPTION = QCAD Applicat
|
|
|
7e0b93e |
QMAKE_TARGET_COPYRIGHT =
|
|
|
7e0b93e |
QMAKE_TARGET_PRODUCT = QCAD Application Framework
|
|
|
7e0b93e |
|
|
|
7e0b93e |
-DESTDIR = $$PWD/$$ROUTDIR
|
|
|
7e0b93e |
+DESTDIR = $$shadowed($$PWD)/$$ROUTDIR
|
|
|
7e0b93e |
UI_DIR = .ui
|
|
|
7e0b93e |
|
|
|
7e0b93e |
-LIBS += -L$$PWD/$$ROUTDIR
|
|
|
7e0b93e |
+LIBS += -L$$shadowed($$PWD)/$$ROUTDIR
|
|
|
7e0b93e |
|
|
|
7e0b93e |
CONFIG(debug, debug|release) {
|
|
|
7e0b93e |
!win32 {
|
|
|
7e0b93e |
diff -rupN src/3rdparty/3rdparty.pro qcad-3.15.6.1-new/src/3rdparty/3rdparty.pro
|
|
|
7e0b93e |
--- src/3rdparty/3rdparty.pro 2016-12-01 10:40:01.000000000 +0100
|
|
|
7e0b93e |
+++ src/3rdparty/3rdparty.pro 2016-12-18 21:08:23.664591423 +0100
|
|
|
7e0b93e |
@@ -1,9 +1,6 @@
|
|
|
7e0b93e |
include (../../shared.pri)
|
|
|
7e0b93e |
TEMPLATE = subdirs
|
|
|
7e0b93e |
-SUBDIRS = \
|
|
|
7e0b93e |
- spatialindexnavel \
|
|
|
7e0b93e |
- stemmer \
|
|
|
7e0b93e |
- quazip
|
|
|
7e0b93e |
+SUBDIRS = stemmer spatialindexnavel
|
|
|
7e0b93e |
|
|
|
7e0b93e |
!r_no_opennurbs {
|
|
|
7e0b93e |
SUBDIRS += opennurbs
|
|
|
7e0b93e |
diff -rupN src/spatialindex/RSpatialIndexNavel.h qcad-3.15.6.1-new/src/spatialindex/RSpatialIndexNavel.h
|
|
|
7e0b93e |
--- src/spatialindex/RSpatialIndexNavel.h 2016-12-01 10:40:01.000000000 +0100
|
|
|
7e0b93e |
+++ src/spatialindex/RSpatialIndexNavel.h 2016-12-18 21:04:31.387312658 +0100
|
|
|
7e0b93e |
@@ -28,7 +28,7 @@
|
|
|
7e0b93e |
|
|
|
7e0b93e |
#include "RSpatialIndex.h"
|
|
|
7e0b93e |
|
|
|
7e0b93e |
-#include "spatialindexnavel/include/spatialindex/SpatialIndex.h"
|
|
|
7e0b93e |
+#include "spatialindex/SpatialIndex.h"
|
|
|
7e0b93e |
|
|
|
7e0b93e |
class RSiDataStream : public SpatialIndex::IDataStream
|
|
|
7e0b93e |
{
|
|
|
7e0b93e |
--- src/scripting/ecmaapi/ecmaapi.orig.pro 2016-12-01 10:40:01.000000000 +0100
|
|
|
7e0b93e |
+++ src/scripting/ecmaapi/ecmaapi.pro 2016-12-19 19:03:52.081431285 +0100
|
|
|
7e0b93e |
@@ -28,4 +28,4 @@
|
|
|
7e0b93e |
-l$${RLIBNAME}spatialindex \
|
|
|
7e0b93e |
-l$${RLIBNAME}stemmer \
|
|
|
7e0b93e |
-l$${RLIBNAME}zip \
|
|
|
7e0b93e |
- -lquazip
|
|
|
7e0b93e |
+ -lquazip5
|
|
|
7e0b93e |
--- src/zip/zip.orig.pro 2016-12-01 10:40:01.000000000 +0100
|
|
|
7e0b93e |
+++ src/zip/zip.pro 2016-12-19 19:05:42.959796504 +0100
|
|
|
7e0b93e |
@@ -23,7 +23,7 @@
|
|
|
7e0b93e |
CONFIG += plugin
|
|
|
7e0b93e |
}
|
|
|
7e0b93e |
TARGET = $${RLIBNAME}zip
|
|
|
7e0b93e |
-LIBS += -l$${RLIBNAME}core -lquazip
|
|
|
7e0b93e |
+LIBS += -l$${RLIBNAME}core -lquazip5
|
|
|
7e0b93e |
OTHER_FILES += zip.dox
|
|
|
7e0b93e |
DEFINES += QCADZIP_LIBRARY
|
|
|
c9c3d1c |
RC_FILE = zip.rc
|
|
|
7e0b93e |
--- shared_app.orig.pri 2016-12-01 10:40:01.000000000 +0100
|
|
|
7e0b93e |
+++ shared_app.pri 2016-12-19 19:07:16.984258212 +0100
|
|
|
7e0b93e |
@@ -13,7 +13,7 @@
|
|
|
7e0b93e |
-l$${RLIBNAME}stemmer \
|
|
|
7e0b93e |
-lstemmer \
|
|
|
7e0b93e |
-l$${RLIBNAME}zip \
|
|
|
7e0b93e |
- -lquazip
|
|
|
7e0b93e |
+ -lquazip5
|
|
|
7e0b93e |
|
|
|
7e0b93e |
!r_no_opennurbs {
|
|
|
7e0b93e |
LIBS += \
|