lucaspalomodevelop/meshlab
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/meshlab.git synced 2026-03-17 10:04:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix linux/linux-g++ (now we are consistent everywhere)

Browse Source
This commit is contained in:
alemuntoni 2020-02-05 16:49:43 +01:00
parent 8e71d27d5b
commit aad59f8725
13 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/README.md
View File

@ -10,22 +10,24 @@ The source code of MeshLab is structured in the following folders:
* meshlabserver: a tool that allows to compute mesh operations through command line
* meshlabplugins: all the plugins that can be added to MeshLab.
There are also a set of sample plugins:
There are also a set of sample plugins:
* sampleplugins.
The following folders are used by `cmake`:
The following folders are used by `cmake`:
* cmake;
* templates.
There are also two folders that contains MeshLab plugins that are no longer supported or are experimental, and these plugins are not compiled in any of MeshLab configurations:
There are also two folders that contains MeshLab plugins that are no longer supported or are experimental, and these plugins are not compiled in any of MeshLab configurations:
* plugins_experimental;
* plugins_unsupported.
## Compiling MeshLab
MeshLab compiles with the three major compilers: `gcc`, `clang`, and `msvc`.
MeshLab requires [Qt](https://www.qt.io/) >= 5.9, with `script` and `xmlpatterns` as additional packages.
After setting up the Qt environment:

2
src/external/ext_common.pri vendored
View File

@ -1,4 +1,4 @@
linux:DESTDIR = $$MESHLAB_DISTRIB_DIRECTORY/lib/linux-g++
linux:DESTDIR = $$MESHLAB_DISTRIB_DIRECTORY/lib/linux
macx:DESTDIR = $$MESHLAB_DISTRIB_DIRECTORY/lib/macx64
win32-g++:DESTDIR = $$MESHLAB_DISTRIB_DIRECTORY/lib/win32-gcc
win32-msvc:DESTDIR = $$MESHLAB_DISTRIB_DIRECTORY/lib/win32-msvc

4
src/general.pri
View File

@ -54,9 +54,9 @@ macx:QMAKE_LFLAGS+= -L$$MESHLAB_DISTRIB_DIRECTORY/lib/macx64 -L$$MESHLAB_DISTRIB
######## LINUX SETTINGS ##########
linux-g++:QMAKE_CXXFLAGS+=-Wno-unknown-pragmas
#linux-g++:QMAKE_CXXFLAGS+=-Wno-unknown-pragmas
# Set up library search paths
linux:QMAKE_RPATHDIR += $$MESHLAB_DISTRIB_DIRECTORY/lib
linux:QMAKE_LFLAGS+= -L$$MESHLAB_DISTRIB_DIRECTORY/lib/linux -L$$MESHLAB_DISTRIB_DIRECTORY/lib
linux-g++:QMAKE_LFLAGS+= -L$$MESHLAB_DISTRIB_DIRECTORY/lib/linux-g++ -L$$MESHLAB_DISTRIB_DIRECTORY/lib
linux:QMAKE_LFLAGS+= -L$$MESHLAB_DISTRIB_DIRECTORY/lib/linux -L$$MESHLAB_DISTRIB_DIRECTORY/lib

2
src/meshlab/meshlab.pro
View File

@ -144,7 +144,7 @@ macx:QMAKE_POST_LINK = "\
linux:LIBS += \
-lcommon -lGLU \
-L$$MESHLAB_DISTRIB_DIRECTORY/lib/linux-g++ -ljhead
-L$$MESHLAB_DISTRIB_DIRECTORY/lib/linux -ljhead
!CONFIG(system_glew) {
INCLUDEPATH *= $$GLEWDIR/include

2
src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs.pro
View File

@ -36,4 +36,4 @@ INCLUDEPATH *= \
win32-msvc:LIBS += $$MESHLAB_DISTRIB_DIRECTORY/lib/win32-msvc/levmar.lib
win32-g++:LIBS += -L$$MESHLAB_DISTRIB_DIRECTORY/lib/win32-gcc -llevmar
macx:LIBS+= $$MESHLAB_DISTRIB_DIRECTORY/lib/macx64/liblevmar.a
linux-g++:LIBS += -llevmar
linux:LIBS += -llevmar

2
src/meshlabplugins/filter_func/filter_func.pro
View File

@ -18,4 +18,4 @@ INCLUDEPATH += $$MESHLAB_EXTERNAL_DIRECTORY/muparser_v225/include
win32-msvc:LIBS += $$MESHLAB_DISTRIB_DIRECTORY/lib/win32-msvc/muparser.lib
win32-g++:LIBS += $$MESHLAB_DISTRIB_DIRECTORY/lib/win32-gcc/libmuparser.a
macx:LIBS += $$MESHLAB_DISTRIB_DIRECTORY/lib/macx64/libmuparser.a
linux:LIBS += -L$$MESHLAB_DISTRIB_DIRECTORY/lib/linux-g++ -lmuparser
linux:LIBS += -lmuparser

4
src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro
View File

@ -30,12 +30,12 @@ INCLUDEPATH += \
win32-msvc:QMAKE_CXXFLAGS += /openmp -D_USE_OMP
win32-g++:QMAKE_LFLAGS += -fopenmp
linux-g++:QMAKE_CXXFLAGS += -fopenmp -D_USE_OMP
linux:QMAKE_CXXFLAGS += -fopenmp -D_USE_OMP
win32-msvc:LIBS += $$MESHLAB_DISTRIB_DIRECTORY/lib/win32-msvc/levmar.lib
win32-g++:LIBS += -L$$MESHLAB_DISTRIB_DIRECTORY/lib/win32-gcc -llevmar
macx:LIBS += $$MESHLAB_DISTRIB_DIRECTORY/lib/macx64/liblevmar.a
linux-g++:LIBS += -llevmar
linux:LIBS += -llevmar
# Please never ever uncomment this...
#QMAKE_CXXFLAGS += -fpermissive

2
src/meshlabplugins/filter_qhull/filter_qhull.pro
View File

@ -14,6 +14,6 @@ INCLUDEPATH += \
win32-msvc:LIBS += $$MESHLAB_DISTRIB_DIRECTORY/lib/win32-msvc/qhull.lib
win32-g++:LIBS += $$MESHLAB_DISTRIB_DIRECTORY/lib/win32-gcc/libqhull.a
macx:LIBS += $$MESHLAB_DISTRIB_DIRECTORY/lib/macx64/libqhull.a
linux:LIBS += -L$$MESHLAB_DISTRIB_DIRECTORY/lib/linux-g++ -lqhull
linux:LIBS += -lqhull
TARGET = filter_qhull

2
src/meshlabplugins/filter_ssynth/filter_ssynth.pro
View File

@ -27,7 +27,7 @@ OTHER_FILES += \
win32-msvc:LIBS += $$MESHLAB_DISTRIB_DIRECTORY/lib/win32-msvc/ssynth.lib
win32-g++:LIBS += $$MESHLAB_DISTRIB_DIRECTORY/lib/win32-gcc/libssynth.a
macx:LIBS += $$MESHLAB_DISTRIB_DIRECTORY/lib/macx64/libssynth.a
linux:LIBS += -L$$MESHLAB_DISTRIB_DIRECTORY/lib/linux-g++ -lssynth
linux:LIBS += -lssynth
TARGET = filter_ssynth

2
src/meshlabplugins/io_3ds/io_3ds.pro
View File

@ -27,6 +27,6 @@ TARGET = io_3ds
win32-msvc:LIBS += $$MESHLAB_DISTRIB_DIRECTORY/lib/win32-msvc/3ds.lib
win32-g++:LIBS += $$MESHLAB_DISTRIB_DIRECTORY/lib/win32-gcc/lib3ds.a
macx:LIBS += $$MESHLAB_DISTRIB_DIRECTORY/lib/macx64/lib3ds.a
linux-g++:LIBS += -l3ds
linux:LIBS += -l3ds

2
src/meshlabplugins/io_ctm/io_ctm.pro
View File

@ -18,4 +18,4 @@ win32-g++:DEFINES += OPENCTM_STATIC
win32-msvc:LIBS += $$MESHLAB_DISTRIB_DIRECTORY/lib/win32-msvc/openctm.lib
win32-g++:LIBS += $$MESHLAB_DISTRIB_DIRECTORY/lib/win32-gcc/libopenctm.a
macx:LIBS += $$MESHLAB_DISTRIB_DIRECTORY/lib/macx64/libopenctm.a
linux-g++:LIBS += -lopenctm
linux:LIBS += -lopenctm

4
src/plugins_experimental/filter_multiscale_align/filter_multiscale_align.pro
View File

@ -22,8 +22,8 @@ CONFIG(system_eigen3): INCLUDEPATH *= $$EIGENDIR #needed by Grenaille
unix: QMAKE_CXXFLAGS += -DQ_OS_LINUX
# OpenMP
LIBS += -fopenmp
linux:LIBS += -fopenmp
QMAKE_CXXFLAGS += -std=c++11
QMAKE_CXXFLAGS += -fopenmp
linux:QMAKE_CXXFLAGS += -fopenmp
#QMAKE_CXXFLAGS_RELEASE += -g
#QMAKE_CXXFLAGS_RELEASE -= -O2

2
src/shared.pri
View File

@ -12,7 +12,7 @@ QT += script
mac:LIBS += $$MESHLAB_DISTRIB_DIRECTORY/lib/libcommon.dylib
win32-msvc:LIBS += $$MESHLAB_DISTRIB_DIRECTORY/lib/common.lib -lopengl32 -lGLU32
win32-g++:LIBS += -lcommon -lopengl32 -lGLU32
linux-g++:LIBS += -lcommon -lGL -lGLU
linux:LIBS += -lcommon -lGL -lGLU
win32-msvc:DEFINES += GLEW_STATIC _USE_MATH_DEFINES