You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
gentoo-overlay/media-gfx/meshlab/files/2016.12/0001-depend-on-system-glew....

73 lines
1.9 KiB

From 58a86b4c48ef89faa5d4d16c502d5350fb1c5df3 Mon Sep 17 00:00:00 2001
From: Sobhan Mohammadpour <www.sobhan.mohammadpour@gmail.com>
Date: Thu, 23 Nov 2017 00:57:42 +0330
Subject: [PATCH] depend-on-system-glew
---
common/common.pro | 7 +------
meshlab/meshlab.pro | 2 --
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/common/common.pro b/common/common.pro
index 51cdcb5..85849dc 100644
--- a/common/common.pro
+++ b/common/common.pro
@@ -1,7 +1,6 @@
include (../general.pri)
EXIF_DIR = ../external/jhead-2.95
-GLEWCODE = $$GLEWDIR/src/glew.c
win32-msvc2005:DESTDIR = ../distrib
win32-msvc2008:DESTDIR = ../distrib
@@ -53,9 +52,7 @@ ln -s ../../../meshlab/src/distrib/shaders ../distrib/shaders ;\
echo "linked shader dir"; \
fi;\
"
-INCLUDEPATH *= ../.. \
- $$VCGDIR \
- $$GLEWDIR/include
+
TEMPLATE = lib
linux-g++:CONFIG += dll
linux-g++:DESTDIR = ../distrib
@@ -80,7 +77,6 @@ QT += script
TARGET = common
DEPENDPATH += .
INCLUDEPATH += . $$EXIF_DIR
-DEFINES += GLEW_STATIC
win32-msvc2005:DEFINES += _CRT_SECURE_NO_WARNINGS
win32-msvc2008:DEFINES += _CRT_SECURE_NO_WARNINGS
win32-msvc2010:DEFINES += _CRT_SECURE_NO_WARNINGS
@@ -117,7 +113,6 @@ SOURCES += filterparameter.cpp \
mlapplication.cpp \
scriptsyntax.cpp \
searcher.cpp \
- $$GLEWCODE \
meshlabdocumentxml.cpp \
meshlabdocumentbundler.cpp \
ml_shared_data_context.cpp
diff --git a/meshlab/meshlab.pro b/meshlab/meshlab.pro
index 0e50581..37d44ba 100644
--- a/meshlab/meshlab.pro
+++ b/meshlab/meshlab.pro
@@ -9,7 +9,6 @@ INCLUDEPATH *= . \
.. \
../.. \
$$VCGDIR \
- $$GLEWDIR/include \
$$EXIF_DIR
DEPENDPATH += $$VCGDIR \
$$VCGDIR/vcg \
@@ -64,7 +63,6 @@ SOURCES = main.cpp \
$$VCGDIR/wrap/gui/trackball.cpp \
$$VCGDIR/wrap/gui/trackmode.cpp \
$$VCGDIR/wrap/gui/coordinateframe.cpp \
- #$$GLEWDIR/src/glew.c \
glarea_setting.cpp \
filterthread.cpp
--
2.15.0