summarylogtreecommitdiffstats
path: root/external.patch
diff options
context:
space:
mode:
Diffstat (limited to 'external.patch')
-rw-r--r--external.patch26
1 files changed, 0 insertions, 26 deletions
diff --git a/external.patch b/external.patch
index 28ea7d3ec546..11ada8742e98 100644
--- a/external.patch
+++ b/external.patch
@@ -16,29 +16,3 @@ index 7bd97f60..93ed196b 100644
- lib3ds-1.3.0/lib3ds/lib3ds.pro
-# openkinect/openkinect.pro
+ jhead-2.95/jhead-2.95.pro
-diff --git a/src/external/ext_common.pri b/src/external/ext_common.pri
-index 878e9cdc..387fe3ce 100644
---- a/src/external/ext_common.pri
-+++ b/src/external/ext_common.pri
-@@ -12,7 +12,7 @@ win32-msvc2015:DEFINES += _CRT_SECURE_NO_WARNINGS
- win32-msvc2017:DEFINES += _CRT_SECURE_NO_WARNINGS
- win32-msvc:DEFINES += _CRT_SECURE_NO_WARNINGS
-
--linux:DESTDIR = $$EXTERNAL_BASE_PATH/lib/linux
-+linux:DESTDIR = $$EXTERNAL_BASE_PATH/lib/linux-g++
-
- unix:CONFIG(release, debug|release) {
- DEFINES *= NDEBUG
-diff --git a/src/meshlab/meshlab.pro b/src/meshlab/meshlab.pro
-index cae4cb4f..a3fbcdc3 100644
---- a/src/meshlab/meshlab.pro
-+++ b/src/meshlab/meshlab.pro
-@@ -154,7 +154,7 @@ win32-g++:LIBS += -L../external/lib/win32-gcc -ljhead -L../distrib -lcom
- # win32-g++:release:LIBS += -L../common/release -lcommon
- #}
-
--linux:LIBS += -L$$PWD/../external/lib/linux -ljhead -L../distrib -lcommon -lGLU
-+linux:LIBS += -L$$PWD/../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU
- linux:QMAKE_RPATHDIR += ../distrib
-
- # uncomment in your local copy only in emergency cases.