summaryrefslogtreecommitdiff
path: root/media-gfx/meshlab/files/2016.12/0001-use-external-glew.patch
diff options
context:
space:
mode:
Diffstat (limited to 'media-gfx/meshlab/files/2016.12/0001-use-external-glew.patch')
-rw-r--r--media-gfx/meshlab/files/2016.12/0001-use-external-glew.patch95
1 files changed, 0 insertions, 95 deletions
diff --git a/media-gfx/meshlab/files/2016.12/0001-use-external-glew.patch b/media-gfx/meshlab/files/2016.12/0001-use-external-glew.patch
deleted file mode 100644
index 58d760499920..000000000000
--- a/media-gfx/meshlab/files/2016.12/0001-use-external-glew.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 3b698bccccaeeee03c4bf454971b9c4bc00f2450 Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <www.sobhan.mohammadpour@gmail.com>
-Date: Thu, 23 Nov 2017 01:22:19 +0330
-Subject: [PATCH] use-external-glew
-
----
- common/common.pro | 7 ++++---
- meshlab/meshlab.pro | 8 ++++----
- meshlabserver/meshlabserver.pro | 8 ++++----
- 3 files changed, 12 insertions(+), 11 deletions(-)
-
-diff --git a/common/common.pro b/common/common.pro
-index 8bdf6a5..0edc245 100644
---- a/common/common.pro
-+++ b/common/common.pro
-@@ -1,7 +1,7 @@
- include (../general.pri)
- #EXIF_DIR = ../external/jhead-2.95
-
--GLEWCODE = $$GLEWDIR/src/glew.c
-+#GLEWCODE = $$GLEWDIR/src/glew.c
-
- win32-msvc2005:DESTDIR = ../distrib
- win32-msvc2008:DESTDIR = ../distrib
-@@ -55,7 +55,8 @@ fi;\
- "
- INCLUDEPATH *= ../.. \
- $$VCGDIR \
-- $$GLEWDIR/include
-+# $$GLEWDIR/include
-+
- TEMPLATE = lib
- linux-g++:CONFIG += dll
- linux-g++:DESTDIR = ../distrib
-@@ -80,7 +81,7 @@ QT += script
- TARGET = common
- DEPENDPATH += .
- #INCLUDEPATH += . $$EXIF_DIR
--DEFINES += GLEW_STATIC
-+#DEFINES += GLEW_STATIC
- win32-msvc2005:DEFINES += _CRT_SECURE_NO_WARNINGS
- win32-msvc2008:DEFINES += _CRT_SECURE_NO_WARNINGS
- win32-msvc2010:DEFINES += _CRT_SECURE_NO_WARNINGS
-diff --git a/meshlab/meshlab.pro b/meshlab/meshlab.pro
-index 5456342..9d45834 100644
---- a/meshlab/meshlab.pro
-+++ b/meshlab/meshlab.pro
-@@ -9,7 +9,7 @@ INCLUDEPATH *= . \
- .. \
- ../.. \
- $$VCGDIR \
-- $$GLEWDIR/include \
-+# $$GLEWDIR/include \
- # $$EXIF_DIR
-
- DEPENDPATH += $$VCGDIR \
-@@ -151,11 +151,11 @@ win32-g++:LIBS += -L../external/lib/win32-gcc -ljhead -L../distrib -lcom
- # win32-g++:release:LIBS += -L../common/release -lcommon
- #}
-
--linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU
-+linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU -lGLEW
- linux-g++:QMAKE_RPATHDIR += ../distrib
--linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -ljhead -L../distrib -lcommon -lGLU
-+linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -ljhead -L../distrib -lcommon -lGLU -lGLEW
- linux-g++-32:QMAKE_RPATHDIR += ../distrib
--linux-g++-64:LIBS += -L../external/lib/linux-g++-64 -ljhead -L../distrib -lcommon -lGLU
-+linux-g++-64:LIBS += -L../external/lib/linux-g++-64 -ljhead -L../distrib -lcommon -lGLU -lGLEW
- linux-g++-64:QMAKE_RPATHDIR += ../distrib
-
- # uncomment in your local copy only in emergency cases.
-diff --git a/meshlabserver/meshlabserver.pro b/meshlabserver/meshlabserver.pro
-index c9f5d0e..2b96033 100644
---- a/meshlabserver/meshlabserver.pro
-+++ b/meshlabserver/meshlabserver.pro
-@@ -28,12 +28,12 @@ win32-msvc2008: LIBS += -L../distrib -lcommon -lopengl32 -lGLU32
- win32-msvc2010: LIBS += -L../distrib -lcommon -lopengl32 -lGLU32
- win32-msvc2012: LIBS += -L../distrib -lcommon -lopengl32 -lGLU32
- win32-msvc2015: LIBS += -L../distrib -lcommon -lopengl32 -lGLU32
--win32-g++: LIBS += -L../distrib -lcommon
--linux-g++: LIBS += -L../distrib -lcommon
-+win32-g++: LIBS += -L../distrib -lcommon
-+linux-g++: LIBS += -L../distrib -lcommon -lGLEW
- linux-g++:QMAKE_RPATHDIR += ../distrib
--linux-g++-32: LIBS += -L../distrib -lcommon
-+linux-g++-32: LIBS += -L../distrib -lcommon -lGLEW
- linux-g++-32:QMAKE_RPATHDIR += ../distrib
--linux-g++-64: LIBS += -L../distrib -lcommon
-+linux-g++-64: LIBS += -L../distrib -lcommon -lGLEW
- linux-g++-64:QMAKE_RPATHDIR += ../distrib
- #CONFIG (release,debug | release) {
- # win32-msvc2005:release: LIBS += -L../common/release -lcommon
---
-2.15.0
-