lucaspalomodevelop/meshlab
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/meshlab.git synced 2026-03-14 08:34:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

meshlab builds with last visual studio versions; added deployment for windows

Browse Source
This commit is contained in:
alemuntoni 2019-12-10 12:02:12 +01:00
parent 7d5a377822
commit df95aa0596
25 changed files with 4332 additions and 4340 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
.github/workflows/CompileAndDeploy.yml vendored
View File

@ -31,12 +31,12 @@ jobs:
run: |
cd src/external
qmake external.pro
make -j8
- name: Compiling meshlab
make -j4
- name: Compiling Meshlab
run: |
cd src/
qmake meshlab_full.pro
make -j8
make -j4
macos_build:
name: Build MeshLab (MacOS)
@ -63,12 +63,12 @@ jobs:
run: |
cd src/external
qmake external.pro
make -j8
- name: Compiling meshlab
make -j4
- name: Compiling Meshlab
run: |
cd src/
qmake meshlab_full.pro
make -j8
make -j4
- name: Creating DMG
run: |
cd src/install/macx
@ -76,22 +76,59 @@ jobs:
echo "------ Completed!!! We should have a dmg here "
cd ../../..
ls -la src/distrib/MeshLab201804.dmg
- name: Upload DMG
- name: Uploading DMG
uses: actions/upload-artifact@v1
with:
name: meshlab_dmg
path: src/distrib/MeshLab201804.dmg
windows_build:
name: Build MeshLab (Windows)
runs-on: windows-latest
steps:
- uses: actions/checkout@v1
- name: Setting MSVC
uses: ilammy/msvc-dev-cmd@v1
- name: Installing QT
uses: jurplel/install-qt-action@v2
with:
modules: qtscript xmlpatterns
- name: Installing dependencies
run: |
cd ..
git clone --depth=1 --branch=devel https://github.com/cnr-isti-vclab/vcglib.git
- name: Compiling external
run: |
cd src\external
qmake external.pro -r
nmake
- name: Compiling Meshlab
run: |
cd src\
qmake meshlab_full.pro -r
nmake
- name: Creating Meshlab Portable
run: |
cd src\distrib
windeployqt --no-translations meshlab.exe
- name: Uploading Meshlab Portable
uses: actions/upload-artifact@v1
with:
name: meshlab_portable
path: src\distrib
create_prerelease:
name: Create Prerelease
needs: [ubuntu_build, macos_build]
name: Creating Prerelease
needs: [ubuntu_build, macos_build, windows_build]
runs-on: ubuntu-latest
steps:
- name: Setting env variables
id: envs
run: |
echo ::set-output name=date::"$(date +%Y-%m)"
- name: Publish PreRelease
- name: Publishing PreRelease
id: create_prerelease
uses: actions/create-release@v1.0.0
env:
@ -101,11 +138,11 @@ jobs:
release_name: MeshLab-${{steps.envs.outputs.date}}-beta
draft: false
prerelease: true
- name: Download DMG
- name: Downloading DMG
uses: actions/download-artifact@v1
with:
name: meshlab_dmg
- name: Upload PreReleaseMacOS
- name: Uploading PreReleaseMacOS
id: upload-prerelease-macos
uses: actions/upload-release-asset@v1.0.1
env:
@ -115,7 +152,25 @@ jobs:
asset_path: meshlab_dmg/MeshLab201804.dmg
asset_name: MeshLab201804.dmg
asset_content_type: MeshLab for MacOS
# - name: Upload PreReleaseUbuntu
- name: Downloading MeshLab Portable
uses: actions/download-artifact@v1
with:
name: meshlab_portable
- name: Creating Meshlab Portable Archive
run: |
zip -r Meshlab${{steps.envs.outputs.date}}-portable.zip meshlab_portable/
ls
- name: Uploading PreReleaseWindowsPortable
id: upload-prerelease-windows-portable
uses: actions/upload-release-asset@v1.0.1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_prerelease.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
asset_path: Meshlab${{steps.envs.outputs.date}}-portable.zip
asset_name: Meshlab${{steps.envs.outputs.date}}-portable.zip
asset_content_type: MeshLab Portable for Windows
# - name: Uploading PreReleaseUbuntu
# id: upload-prerelease-ubuntu
# uses: actions/upload-release-asset@v1.0.1
# env:

8
.github/workflows/CompileMacOS.yml vendored
View File

@ -29,12 +29,12 @@ jobs:
run: |
cd src/external
qmake external.pro
make -j8
- name: Compiling meshlab
make -j4
- name: Compiling Meshlab
run: |
cd src/
qmake meshlab_full.pro
make -j8
make -j4
- name: Creating DMG
run: |
cd src/install/macx
@ -42,7 +42,7 @@ jobs:
echo "------ Completed!!! We should have a dmg here "
cd ../../..
ls -la src/distrib/MeshLab201804.dmg
- name: Upload DMG
- name: Uploading DMG
uses: actions/upload-artifact@v1
with:
name: meshlab_dmg

6
.github/workflows/CompileUbuntu.yml vendored
View File

@ -30,9 +30,9 @@ jobs:
run: |
cd src/external
qmake external.pro
make -j8
- name: Compiling meshlab
make -j4
- name: Compiling Meshlab
run: |
cd src/
qmake meshlab_full.pro
make -j8
make -j4

43
.github/workflows/CompileWindows.yml vendored Normal file
View File

@ -0,0 +1,43 @@
name: CompileWindows
on: [push, pull_request]
jobs:
windows_build:
name: Build MeshLab (Windows)
runs-on: windows-latest
steps:
- uses: actions/checkout@v1
- name: Setting MSVC
uses: ilammy/msvc-dev-cmd@v1
- name: Installing QT
uses: jurplel/install-qt-action@v2
with:
modules: qtscript xmlpatterns
- name: Installing dependencies
run: |
cd ..
git clone --depth=1 --branch=devel https://github.com/cnr-isti-vclab/vcglib.git
- name: Compiling external
run: |
cd src\external
qmake external.pro -r
nmake #jom -j 4 -f Makefile #nmake does not support parallel compilation
- name: Compiling Meshlab
run: |
cd src\
qmake meshlab_full.pro -r
nmake #jom -j 4 -f Makefile #nmake does not support parallel compilation
- name: Creating Meshlab Portable
run: |
cd src\distrib
windeployqt --no-translations meshlab.exe
- name: Uploading Meshlab Portable
uses: actions/upload-artifact@v1
with:
name: meshlab_portable
path: src\distrib

16
src/common/common.pro
View File

@ -1,13 +1,6 @@
include (../general.pri)
EXIF_DIR = ../external/jhead-2.95
win32-msvc2005:DESTDIR = ../distrib
win32-msvc2008:DESTDIR = ../distrib
win32-msvc2010:DESTDIR = ../distrib
win32-msvc2012:DESTDIR = ../distrib
win32-msvc2013:DESTDIR = ../distrib
win32-msvc2015:DESTDIR = ../distrib
win32-msvc:DESTDIR = ../distrib
win32-g++:DLLDESTDIR = ../distrib
@ -55,12 +48,6 @@ linux:DESTDIR = ../distrib
linux-g++:QMAKE_CXXFLAGS+=-Wno-unknown-pragmas
win32-msvc2005:CONFIG += staticlib
win32-msvc2008:CONFIG += staticlib
win32-msvc2010:CONFIG += staticlib
win32-msvc2012:CONFIG += staticlib
win32-msvc2013:CONFIG += staticlib
win32-msvc2015:CONFIG += staticlib
win32-msvc:CONFIG += staticlib
QT += opengl
@ -72,9 +59,6 @@ QT += script
TARGET = common
DEPENDPATH += .
win32-msvc:DEFINES += _CRT_SECURE_NO_WARNINGS
# Input
HEADERS += filterparameter.h \
filterscript.h \

13
src/external/ext_common.pri vendored
View File

@ -1,18 +1,7 @@
linux:DESTDIR = $$EXTERNAL_BASE_PATH/lib/linux-g++
macx:DESTDIR = $$EXTERNAL_BASE_PATH/lib/macx64
win32-g++:DESTDIR = $$EXTERNAL_BASE_PATH/lib/win32-gcc
win32-msvc2005:DESTDIR = $$EXTERNAL_BASE_PATH/lib/win32-msvc2005
win32-msvc2008:DESTDIR = $$EXTERNAL_BASE_PATH/lib/win32-msvc2008
win32-msvc2010:DESTDIR = $$EXTERNAL_BASE_PATH/lib/win32-msvc2010
win32-msvc2012:DESTDIR = $$EXTERNAL_BASE_PATH/lib/win32-msvc2012
win32-msvc2013:DESTDIR = $$EXTERNAL_BASE_PATH/lib/win32-msvc2013
win32-msvc2015:DESTDIR = $$EXTERNAL_BASE_PATH/lib/win32-msvc2015
win32-msvc2017:DESTDIR = $$EXTERNAL_BASE_PATH/lib/win32-msvc2017
win32-msvc:DESTDIR = $$EXTERNAL_BASE_PATH/lib/win32-msvc
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-g++
unix:CONFIG(release, debug|release) {
DEFINES *= NDEBUG

1038
src/external/inc/win32-msvc2008/mpir-2.2.1_x64/config.h → src/external/inc/win32-msvc/mpir-2.2.1_x64/config.h vendored
View File

File diff suppressed because it is too large Load Diff

0
src/external/inc/win32-msvc2008/mpir-2.2.1_x64/gmp-mparam.h → src/external/inc/win32-msvc/mpir-2.2.1_x64/gmp-mparam.h vendored
View File

3684
src/external/inc/win32-msvc2008/mpir-2.2.1_x64/gmp.h → src/external/inc/win32-msvc/mpir-2.2.1_x64/gmp.h vendored
View File

File diff suppressed because it is too large Load Diff

0
src/external/inc/win32-msvc2008/mpir-2.2.1_x64/gmpxx.h → src/external/inc/win32-msvc/mpir-2.2.1_x64/gmpxx.h vendored
View File

3684
src/external/inc/win32-msvc2008/mpir-2.2.1_x64/mpir.h → src/external/inc/win32-msvc/mpir-2.2.1_x64/mpir.h vendored
View File

File diff suppressed because it is too large Load Diff

0
src/external/inc/win32-msvc2008/mpir-2.2.1_x64/mpirxx.h → src/external/inc/win32-msvc/mpir-2.2.1_x64/mpirxx.h vendored
View File

BIN
src/external/lib/win32-msvc/mpir.lib vendored Normal file
View File

Binary file not shown.

BIN
src/external/lib/win32-msvc/mpirxx.lib vendored Normal file
View File

Binary file not shown.

23
src/meshlab/meshlab.pro
View File

@ -111,22 +111,10 @@ QT += xmlpatterns
QT += network
QT += script
# the following line is needed to avoid mismatch between
# the awful min/max macros of windows and the limits max
win32:DEFINES += NOMINMAX
# the following line is to hide the hundred of warnings about the deprecated
# old printf are all around the code
win32-msvc:DEFINES += _CRT_SECURE_NO_DEPRECATE
win32-msvc2005:DEFINES += _CRT_SECURE_NO_DEPRECATE
win32-msvc2008:DEFINES += _CRT_SECURE_NO_DEPRECATE
win32-msvc2010:DEFINES += _CRT_SECURE_NO_DEPRECATE
win32-msvc2012:DEFINES += _CRT_SECURE_NO_DEPRECATE
win32-msvc2013:DEFINES += _CRT_SECURE_NO_DEPRECATE
win32-msvc2015:DEFINES += _CRT_SECURE_NO_DEPRECATE
# Uncomment these if you want to experiment with newer gcc compilers
# (here using the one provided with macports)
# macx-g++:QMAKE_CXX=g++-mp-4.3
@ -138,14 +126,9 @@ CONFIG += stl
macx:LIBS += -L../external/lib/macx64 -ljhead ../common/libcommon.dylib
macx:QMAKE_POST_LINK ="cp -P ../common/libcommon.1.dylib ../distrib/meshlab.app/Contents/MacOS; install_name_tool -change libcommon.1.dylib @executable_path/libcommon.1.dylib ../distrib/meshlab.app/Contents/MacOS/meshlab"
win32-msvc:LIBS += -L../external/lib/win32-msvc -ljhead -L../distrib -lcommon -lopengl32 -lGLU32
win32-msvc2005:LIBS += -L../external/lib/win32-msvc2005 -ljhead -L../distrib -lcommon -lopengl32 -lGLU32
win32-msvc2008:LIBS += -L../external/lib/win32-msvc2008 -ljhead -L../distrib -lcommon -lopengl32 -lGLU32
win32-msvc2010:LIBS += -L../external/lib/win32-msvc2010 -ljhead -L../distrib -lcommon -lopengl32 -lGLU32
win32-msvc2012:LIBS += -L../external/lib/win32-msvc2012 -ljhead -L../distrib -lcommon -lopengl32 -lGLU32
win32-msvc2013:LIBS += -L../external/lib/win32-msvc2013 -ljhead -L../distrib -lcommon -lopengl32 -lGLU32
win32-msvc2015:LIBS += -L../external/lib/win32-msvc2015 -ljhead -L../distrib -lcommon -lopengl32 -lGLU32
win32-g++:LIBS += -L../external/lib/win32-gcc -ljhead -L../distrib -lcommon -lopengl32 -lGLU32
win32-msvc:LIBS += -L../external/lib/win32-msvc -ljhead -L../distrib -lcommon -lopengl32 -lGLU32
win32-g++:LIBS += -L../external/lib/win32-gcc -ljhead -L../distrib -lcommon -lopengl32 -lGLU32
#CONFIG(release,debug | release) {
# win32-msvc2005:release:LIBS += -L../common/release -lcommon

11
src/meshlabplugins/filter_csg/filter_csg.pro
View File

@ -9,20 +9,15 @@ TARGET = filter_csg
#macx:INCLUDEPATH += ../../external/inc/macx/mpir-2.1.3
macx:INCLUDEPATH += ../../external/inc/macx64/mpir-2.4.0
win32-g++:INCLUDEPATH += ../../external/inc/win32-gcc/mpir-2.2.1
win32-msvc:INCLUDEPATH += ../../external/inc/win32-msvc2008/mpir-2.2.1_x64
win32-msvc2008:INCLUDEPATH += ../../external/inc/win32-msvc2008/mpir-2.2.1_x64
win32-msvc2010:INCLUDEPATH += ../../external/inc/win32-msvc2008/mpir-2.2.1_x64
win32-msvc2012:INCLUDEPATH += ../../external/inc/win32-msvc2008/mpir-2.2.1_x64
win32-msvc2013:INCLUDEPATH += ../../external/inc/win32-msvc2008/mpir-2.2.1_x64
win32-msvc2015:INCLUDEPATH += ../../external/inc/win32-msvc2008/mpir-2.2.1_x64
win32-msvc:INCLUDEPATH += ../../external/inc/win32-msvc/mpir-2.2.1_x64
#macx:LIBS += ../../external/lib/macx/libmpirxx.a ../../external/lib/macx/libgmp.a
macx:LIBS += $$MACLIBDIR/libmpirxx.a $$MACLIBDIR/libmpir.a
win32-g++:LIBS += ../../external/lib/win32-gcc/libmpirxx.a ../../external/lib/win32-gcc/libmpir.a
win32-msvc:LIBS += ../../external/lib/win32-msvc2015/mpirxx.lib ../../external/lib/win32-msvc2015/mpir.lib
win32-msvc:LIBS += ../../external/lib/win32-msvc/mpirxx.lib ../../external/lib/win32-msvc/mpir.lib
#using a different compiled version for for msvc 2008 - 2013
win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/mpirxx.lib ../../external/lib/win32-msvc2008/mpir.lib
win32-msvc2010:LIBS += ../../external/lib/win32-msvc2008/mpirxx.lib ../../external/lib/win32-msvc2008/mpir.lib
win32-msvc2012:LIBS += ../../external/lib/win32-msvc2008/mpirxx.lib ../../external/lib/win32-msvc2008/mpir.lib
win32-msvc2013:LIBS += ../../external/lib/win32-msvc2008/mpirxx.lib ../../external/lib/win32-msvc2008/mpir.lib
win32-msvc2015:LIBS += ../../external/lib/win32-msvc2015/mpirxx.lib ../../external/lib/win32-msvc2015/mpir.lib
linux:INCLUDEPATH += ../../external/inc/linux-g++/mpir-2.4.0

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

@ -14,12 +14,6 @@ INCLUDEPATH += ../../external/muparser_v225/include
# ./configure --enable-shared=no
win32-msvc:LIBS += ../../external/lib/win32-msvc/muparser.lib
win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/muparser.lib
win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/muparser.lib
win32-msvc2010:LIBS += ../../external/lib/win32-msvc2010/muparser.lib
win32-msvc2012:LIBS += ../../external/lib/win32-msvc2012/muparser.lib
win32-msvc2013:LIBS += ../../external/lib/win32-msvc2013/muparser.lib
win32-msvc2015:LIBS += ../../external/lib/win32-msvc2015/muparser.lib
macx:LIBS += $$MACLIBDIR/libmuparser.a
linux-g++:LIBS += -lmuparser

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

@ -27,11 +27,6 @@ INCLUDEPATH += ./ \
../../external/levmar-2.3/
win32-msvc:QMAKE_CXXFLAGS += /openmp -D_USE_OMP
win32-msvc2005:QMAKE_CXXFLAGS += /openmp -D_USE_OMP
win32-msvc2008:QMAKE_CXXFLAGS += /openmp -D_USE_OMP
win32-msvc2010:QMAKE_CXXFLAGS += /openmp -D_USE_OMP
win32-msvc2012:QMAKE_CXXFLAGS += /openmp -D_USE_OMP
win32-msvc2015:QMAKE_CXXFLAGS += /openmp -D_USE_OMP
#win32-g++:QMAKE_CXXFLAGS += -fopenmp -D_USE_OMP
win32-g++:QMAKE_LFLAGS += -fopenmp
#linux-g++:QMAKE_CXXFLAGS += -fopenmp -D_USE_OMP
@ -47,11 +42,6 @@ macx:QMAKE_LFLAGS += -fopenmp
}
}
win32-msvc:LIBS += ../../external/lib/win32-msvc/levmar.lib
win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/levmar.lib
win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/levmar.lib
win32-msvc2010:LIBS += ../../external/lib/win32-msvc2010/levmar.lib
win32-msvc2012:LIBS += ../../external/lib/win32-msvc2012/levmar.lib
win32-msvc2015:LIBS += ../../external/lib/win32-msvc2015/levmar.lib
win32-g++:LIBS += -L../../external/lib/win32-gcc -llevmar
linux-g++:LIBS += -llevmar
macx:LIBS += $$MACLIBDIR/liblevmar.a

6
src/meshlabplugins/filter_meshing/filter_meshing.pro
View File

@ -8,8 +8,4 @@ SOURCES += meshfilter.cpp \
TARGET = filter_meshing
win32-msvc2010:QMAKE_CXXFLAGS = /bigobj
win32-msvc2005:QMAKE_CXXFLAGS = /bigobj
win32-msvc2008:QMAKE_CXXFLAGS = /bigobj
win32-msvc2012:QMAKE_CXXFLAGS = /bigobj
win32-msvc2015:QMAKE_CXXFLAGS = /bigobj
win32-msvc:QMAKE_CXXFLAGS = /bigobj

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

@ -11,11 +11,6 @@ SOURCES += filter_ssynth.cpp \
mytrenderer.cpp
INCLUDEPATH += ../../external/structuresynth-1.5/ssynth
win32-msvc:LIBS += ../../external/lib/win32-msvc/ssynth.lib
win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/ssynth.lib
win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/ssynth.lib
win32-msvc2010:LIBS += ../../external/lib/win32-msvc2010/ssynth.lib
win32-msvc2012:LIBS += ../../external/lib/win32-msvc2012/ssynth.lib
win32-msvc2015:LIBS += ../../external/lib/win32-msvc2015/ssynth.lib
win32-g++:LIBS += ../../external/lib/win32-gcc/libssynth.a
linux-g++:LIBS += -lssynth
macx:LIBS += ../../external/lib/macx64/libssynth.a

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

@ -9,7 +9,7 @@ SOURCES += filter_texture.cpp \
$$VCGDIR/wrap/qt/outline2_rasterizer.cpp
TARGET = filter_texture
win32-msvc2005:DEFINES += _USE_MATH_DEFINES
win32-msvc2008:DEFINES += _USE_MATH_DEFINES
win32-msvc:DEFINES += _USE_MATH_DEFINES
#CONFIG += stl
#QT += opengl svg

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

@ -23,9 +23,6 @@ TARGET = io_3ds
# Linux users can rely on their own package managers and hope that it is installing the last version of lib3ds
win32-msvc:LIBS += ../../external/lib/win32-msvc/3ds.lib
win32-msvc2015:LIBS += ../../external/lib/win32-msvc2015/3ds.lib
win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/3ds.lib
win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/3ds.lib
win32-g++:LIBS += ../../external/lib/win32-gcc/lib3ds.a
linux-g++:LIBS += -l3ds

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

@ -7,20 +7,10 @@ TARGET = io_ctm
!CONFIG(system_openctm): INCLUDEPATH *= ../../external/OpenCTM-1.0.3/lib
win32-msvc.net:QMAKE_CXXFLAGS += /DOPENCTM_STATIC
win32-msvc2005:QMAKE_CXXFLAGS += /DOPENCTM_STATIC
win32-msvc2008:QMAKE_CXXFLAGS += /DOPENCTM_STATIC
win32-msvc2010:QMAKE_CXXFLAGS += /DOPENCTM_STATIC
win32-msvc2012:QMAKE_CXXFLAGS += /DOPENCTM_STATIC
win32-msvc2015:QMAKE_CXXFLAGS += /DOPENCTM_STATIC
win32-msvc:QMAKE_CXXFLAGS += /DOPENCTM_STATIC
win32-g++:DEFINES += OPENCTM_STATIC
win32-msvc:LIBS += ../../external/lib/win32-msvc/openctm.lib
win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/openctm.lib
win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/openctm.lib
win32-msvc2010:LIBS += ../../external/lib/win32-msvc2010/openctm.lib
win32-msvc2012:LIBS += ../../external/lib/win32-msvc2012/openctm.lib
win32-msvc2015:LIBS += ../../external/lib/win32-msvc2015/openctm.lib
win32-g++:LIBS += ../../external/lib/win32-gcc/libopenctm.a
linux-g++:LIBS += -lopenctm
#macx:LIBS += ../../external/lib/macx/libopenctm.a

10
src/meshlabserver/meshlabserver.pro
View File

@ -25,11 +25,6 @@ macx:QMAKE_POST_LINK ="install_name_tool -change libcommon.1.dylib @executable_p
mac:LIBS += ../distrib/meshlab.app/Contents/MacOS/libcommon.dylib
win32-msvc: LIBS += -L../distrib -lcommon -lopengl32 -lGLU32
win32-msvc2005: LIBS += -L../distrib -lcommon -lopengl32 -lGLU32
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: LIBS += -L../distrib -lcommon
linux:QMAKE_RPATHDIR += ../distrib
@ -40,11 +35,6 @@ linux:QMAKE_RPATHDIR += ../distrib
#}
win32-msvc:DEFINES += GLEW_STATIC
win32-msvc2005:DEFINES += GLEW_STATIC
win32-msvc2008:DEFINES += GLEW_STATIC
win32-msvc2010:DEFINES += GLEW_STATIC
win32-msvc2012:DEFINES += GLEW_STATIC
win32-msvc2015:DEFINES += GLEW_STATIC
CONFIG(system_glew):LIBS += -lGLEW

9
src/shared.pri
View File

@ -16,27 +16,18 @@ mac:LIBS += ../../common/libcommon.dylib
#correct qmake syntax requires CONFIG(option, list of options)
win32-msvc2013: LIBS += ../../distrib/common.lib -lopengl32 -lGLU32
win32-msvc2015: LIBS += ../../distrib/common.lib -lopengl32 -lGLU32
win32-msvc: LIBS += ../../distrib/common.lib -lopengl32 -lGLU32
win32-g++:LIBS += -L../../distrib -lcommon -lopengl32 -lGLU32
linux-g++:LIBS += -L../../distrib -lcommon -lGL -lGLU
linux-g++-32:LIBS += -L../../distrib -lcommon -lGL -lGLU
linux-g++-64:LIBS += -L../../distrib -lcommon -lGL -lGLU
win32-msvc2013:DEFINES += GLEW_STATIC _USE_MATH_DEFINES
win32-msvc2015:DEFINES += GLEW_STATIC _USE_MATH_DEFINES
win32-msvc:DEFINES += GLEW_STATIC _USE_MATH_DEFINES
INCLUDEPATH *= ../.. $$VCGDIR $$EIGENDIR
!CONFIG(system_glew): INCLUDEPATH *= ../$$GLEWDIR/include
DEPENDPATH += ../.. $$VCGDIR
# the following line is to hide the hundred of warnings about the deprecated
# old printf are all around the code
win32-msvc2013:DEFINES += _CRT_SECURE_NO_DEPRECATE
win32-msvc2015:DEFINES += _CRT_SECURE_NO_DEPRECATE
win32-msvc:DEFINES += _CRT_SECURE_NO_DEPRECATE
CONFIG(release,debug | release){
# Uncomment the following line to disable assert in mingw
#DEFINES += NDEBUG