From b480cedf2fe25f854141670da0b47b41b0da3f26 Mon Sep 17 00:00:00 2001 From: granzuglia Date: Sat, 16 Dec 2017 12:17:06 +1100 Subject: [PATCH] - fixed compiler errors with non-const default arguments parameters passed by references - added support for visual studio 2017 to the projects in meshlab_mini --- src/common/common.pro | 3 + src/common/meshlabdocumentxml.cpp | 201 ++++++++++++------------- src/common/meshlabdocumentxml.h | 13 +- src/common/ml_shared_data_context.h | 2 +- src/external/OpenCTM-1.0.3/openctm.pro | 2 + src/external/ext_common.pri | 2 + src/meshlab/meshlab.pro | 2 + src/shared.pri | 3 + 8 files changed, 122 insertions(+), 106 deletions(-) diff --git a/src/common/common.pro b/src/common/common.pro index 829e5b878..dc89adeb4 100644 --- a/src/common/common.pro +++ b/src/common/common.pro @@ -9,6 +9,7 @@ win32-msvc2010:DESTDIR = ../distrib win32-msvc2012:DESTDIR = ../distrib win32-msvc2013:DESTDIR = ../distrib win32-msvc2015:DESTDIR = ../distrib +win32-msvc:DESTDIR = ../distrib win32-g++:DLLDESTDIR = ../distrib # CONFIG(release,debug | release) { @@ -73,6 +74,7 @@ win32-msvc2010:CONFIG += staticlib win32-msvc2012:CONFIG += staticlib win32-msvc2013:CONFIG += staticlib win32-msvc2015:CONFIG += staticlib +win32-msvc:CONFIG += staticlib QT += opengl QT += xml @@ -90,6 +92,7 @@ win32-msvc2010:DEFINES += _CRT_SECURE_NO_WARNINGS win32-msvc2012:DEFINES += _CRT_SECURE_NO_WARNINGS win32-msvc2013:DEFINES += _CRT_SECURE_NO_WARNINGS win32-msvc2015:DEFINES += _CRT_SECURE_NO_WARNINGS +win32-msvc2017:DEFINES += _CRT_SECURE_NO_WARNINGS # Input diff --git a/src/common/meshlabdocumentxml.cpp b/src/common/meshlabdocumentxml.cpp index 172459114..aab866087 100644 --- a/src/common/meshlabdocumentxml.cpp +++ b/src/common/meshlabdocumentxml.cpp @@ -3,11 +3,10 @@ #include #include -#include "meshmodel.h" #include "meshlabdocumentxml.h" #include -bool MeshDocumentToXMLFile(MeshDocument &md, QString filename, bool onlyVisibleLayers, bool binary, std::map& rendOpt) +bool MeshDocumentToXMLFile(MeshDocument &md, QString filename, bool onlyVisibleLayers, bool binary, const std::map& rendOpt) { md.setFileName(filename); QFileInfo fi(filename); @@ -38,11 +37,11 @@ QDomElement Matrix44mToXML(Matrix44m &m, QDomDocument &doc) QDomElement Matrix44mToBinaryXML(Matrix44m &m, QDomDocument &doc) { - QDomElement matrixElem = doc.createElement("MLMatrix44"); - QByteArray value = QByteArray::fromRawData((char *)m.V(), sizeof(Matrix44m::ScalarType) * 16).toBase64(); - QDomText nd = doc.createTextNode(QString(value)); - matrixElem.appendChild(nd); - return matrixElem; + QDomElement matrixElem = doc.createElement("MLMatrix44"); + QByteArray value = QByteArray::fromRawData((char *)m.V(), sizeof(Matrix44m::ScalarType) * 16).toBase64(); + QDomText nd = doc.createTextNode(QString(value)); + matrixElem.appendChild(nd); + return matrixElem; } bool MeshDocumentFromXML(MeshDocument &md, QString filename, bool binary, std::map& rendOpt) @@ -76,73 +75,73 @@ bool MeshDocumentFromXML(MeshDocument &md, QString filename, bool binary, std::m //return true; filen = mesh.attributes().namedItem("filename").nodeValue(); label = mesh.attributes().namedItem("label").nodeValue(); - bool visible = true; - if (mesh.attributes().contains("visible")) - visible = (mesh.attributes().namedItem("visible").nodeValue().toInt() == 1); - MeshModel* mm = md.addNewMesh(filen, label); - mm->visible = visible; - /*if (mesh.attributes().contains("renderingOptions")) - { - QString value = mesh.attributes().namedItem("renderingOptions").nodeValue(); - rendOpt.insert(std::pair(mm->id(), value.toStdString())); - }*/ - QDomNode tr = mesh.firstChildElement("MLMatrix44"); + bool visible = true; + if (mesh.attributes().contains("visible")) + visible = (mesh.attributes().namedItem("visible").nodeValue().toInt() == 1); + MeshModel* mm = md.addNewMesh(filen, label); + mm->visible = visible; + /*if (mesh.attributes().contains("renderingOptions")) + { + QString value = mesh.attributes().namedItem("renderingOptions").nodeValue(); + rendOpt.insert(std::pair(mm->id(), value.toStdString())); + }*/ + QDomNode tr = mesh.firstChildElement("MLMatrix44"); if (!tr.isNull()) { vcg::Matrix44f trm; if (tr.childNodes().size() == 1) { - if (!binary) - { - QStringList values = tr.firstChild().nodeValue().split(" ", QString::SkipEmptyParts); - for (int y = 0; y < 4; y++) - for (int x = 0; x < 4; x++) - md.mm()->cm.Tr[y][x] = values[x + 4 * y].toFloat(); - } - else - { - QString str = tr.firstChild().nodeValue(); - QByteArray value = QByteArray::fromBase64(str.toLocal8Bit()); - memcpy(md.mm()->cm.Tr.V(), value.data(), sizeof(Matrix44m::ScalarType) * 16); - } + if (!binary) + { + QStringList values = tr.firstChild().nodeValue().split(" ", QString::SkipEmptyParts); + for (int y = 0; y < 4; y++) + for (int x = 0; x < 4; x++) + md.mm()->cm.Tr[y][x] = values[x + 4 * y].toFloat(); + } + else + { + QString str = tr.firstChild().nodeValue(); + QByteArray value = QByteArray::fromBase64(str.toLocal8Bit()); + memcpy(md.mm()->cm.Tr.V(), value.data(), sizeof(Matrix44m::ScalarType) * 16); + } } } - QDomNode renderingOpt = mesh.firstChildElement("RenderingOption"); - if (!renderingOpt.isNull()) - { - QString value = renderingOpt.firstChild().nodeValue(); - MLRenderingData::GLOptionsType opt; - if (renderingOpt.attributes().contains("pointSize")) - opt._perpoint_pointsize = renderingOpt.attributes().namedItem("pointSize").nodeValue().toFloat(); - if (renderingOpt.attributes().contains("wireWidth")) - opt._perwire_wirewidth = renderingOpt.attributes().namedItem("wireWidth").nodeValue().toFloat(); - if (renderingOpt.attributes().contains("boxColor")) - { - QStringList values = renderingOpt.attributes().namedItem("boxColor").nodeValue().split(" ", QString::SkipEmptyParts); - opt._perbbox_fixed_color = vcg::Color4b(values[0].toInt(), values[1].toInt(), values[2].toInt(), values[3].toInt()); - } - if (renderingOpt.attributes().contains("pointColor")) - { - QStringList values = renderingOpt.attributes().namedItem("pointColor").nodeValue().split(" ", QString::SkipEmptyParts); - opt._perpoint_fixed_color = vcg::Color4b(values[0].toInt(), values[1].toInt(), values[2].toInt(), values[3].toInt()); - } - if (renderingOpt.attributes().contains("wireColor")) - { - QStringList values = renderingOpt.attributes().namedItem("wireColor").nodeValue().split(" ", QString::SkipEmptyParts); - opt._perwire_fixed_color = vcg::Color4b(values[0].toInt(), values[1].toInt(), values[2].toInt(), values[3].toInt()); - } - if (renderingOpt.attributes().contains("solidColor")) - { - QStringList values = renderingOpt.attributes().namedItem("solidColor").nodeValue().split(" ", QString::SkipEmptyParts); - opt._persolid_fixed_color = vcg::Color4b(values[0].toInt(), values[1].toInt(), values[2].toInt(), values[3].toInt()); - } - MLRenderingData data; - data.set(opt); - if (data.deserialize(value.toStdString())) - rendOpt.insert(std::pair(mm->id(), data)); - } + QDomNode renderingOpt = mesh.firstChildElement("RenderingOption"); + if (!renderingOpt.isNull()) + { + QString value = renderingOpt.firstChild().nodeValue(); + MLRenderingData::GLOptionsType opt; + if (renderingOpt.attributes().contains("pointSize")) + opt._perpoint_pointsize = renderingOpt.attributes().namedItem("pointSize").nodeValue().toFloat(); + if (renderingOpt.attributes().contains("wireWidth")) + opt._perwire_wirewidth = renderingOpt.attributes().namedItem("wireWidth").nodeValue().toFloat(); + if (renderingOpt.attributes().contains("boxColor")) + { + QStringList values = renderingOpt.attributes().namedItem("boxColor").nodeValue().split(" ", QString::SkipEmptyParts); + opt._perbbox_fixed_color = vcg::Color4b(values[0].toInt(), values[1].toInt(), values[2].toInt(), values[3].toInt()); + } + if (renderingOpt.attributes().contains("pointColor")) + { + QStringList values = renderingOpt.attributes().namedItem("pointColor").nodeValue().split(" ", QString::SkipEmptyParts); + opt._perpoint_fixed_color = vcg::Color4b(values[0].toInt(), values[1].toInt(), values[2].toInt(), values[3].toInt()); + } + if (renderingOpt.attributes().contains("wireColor")) + { + QStringList values = renderingOpt.attributes().namedItem("wireColor").nodeValue().split(" ", QString::SkipEmptyParts); + opt._perwire_fixed_color = vcg::Color4b(values[0].toInt(), values[1].toInt(), values[2].toInt(), values[3].toInt()); + } + if (renderingOpt.attributes().contains("solidColor")) + { + QStringList values = renderingOpt.attributes().namedItem("solidColor").nodeValue().split(" ", QString::SkipEmptyParts); + opt._persolid_fixed_color = vcg::Color4b(values[0].toInt(), values[1].toInt(), values[2].toInt(), values[3].toInt()); + } + MLRenderingData data; + data.set(opt); + if (data.deserialize(value.toStdString())) + rendOpt.insert(std::pair(mm->id(), data)); + } mesh = mesh.nextSibling(); } @@ -159,7 +158,7 @@ bool MeshDocumentFromXML(MeshDocument &md, QString filename, bool binary, std::m QString labelRaster = raster.attributes().namedItem("label").nodeValue(); md.rm()->setLabel(labelRaster); QDomNode sh = raster.firstChild(); - ReadShotFromQDomNode(md.rm()->shot, sh); + ReadShotFromQDomNode(md.rm()->shot, sh); QDomElement el = raster.firstChildElement("Plane"); while (!el.isNull()) @@ -182,35 +181,33 @@ bool MeshDocumentFromXML(MeshDocument &md, QString filename, bool binary, std::m return true; } -QDomElement MeshModelToXML(MeshModel *mp, QDomDocument &doc, bool binary, MLRenderingData* rendOpt = NULL) +QDomElement MeshModelToXML(MeshModel *mp, QDomDocument &doc, bool binary, const MLRenderingData& rendOpt = MLRenderingData()) { QDomElement meshElem = doc.createElement("MLMesh"); meshElem.setAttribute("label", mp->label()); meshElem.setAttribute("filename", mp->relativePathName()); - meshElem.setAttribute("visible", mp->isVisible()); - if (binary) - meshElem.appendChild(Matrix44mToBinaryXML(mp->cm.Tr, doc)); - else - meshElem.appendChild(Matrix44mToXML(mp->cm.Tr, doc)); - if (rendOpt != NULL) - { - QDomElement renderingElem = doc.createElement("RenderingOption"); - std::string text; - rendOpt->serialize(text); - QDomText nd = doc.createTextNode(QString(text.c_str())); - renderingElem.appendChild(nd); - MLRenderingData::GLOptionsType opt; - if (rendOpt->get(opt)) - { - renderingElem.setAttribute("boxColor", QString("%1 %2 %3 %4").arg(opt._perbbox_fixed_color[0]).arg(opt._perbbox_fixed_color[1]).arg(opt._perbbox_fixed_color[2]).arg(opt._perbbox_fixed_color[3])); - renderingElem.setAttribute("pointColor", QString("%1 %2 %3 %4").arg(opt._perpoint_fixed_color[0]).arg(opt._perpoint_fixed_color[1]).arg(opt._perpoint_fixed_color[2]).arg(opt._perpoint_fixed_color[3])); - renderingElem.setAttribute("wireColor", QString("%1 %2 %3 %4").arg(opt._perwire_fixed_color[0]).arg(opt._perwire_fixed_color[1]).arg(opt._perwire_fixed_color[2]).arg(opt._perwire_fixed_color[3])); - renderingElem.setAttribute("solidColor", QString("%1 %2 %3 %4").arg(opt._persolid_fixed_color[0]).arg(opt._persolid_fixed_color[1]).arg(opt._persolid_fixed_color[2]).arg(opt._persolid_fixed_color[3])); - renderingElem.setAttribute("pointSize", opt._perpoint_pointsize); - renderingElem.setAttribute("wireWidth", opt._perwire_wirewidth); - } - meshElem.appendChild(renderingElem); - } + meshElem.setAttribute("visible", mp->isVisible()); + if (binary) + meshElem.appendChild(Matrix44mToBinaryXML(mp->cm.Tr, doc)); + else + meshElem.appendChild(Matrix44mToXML(mp->cm.Tr, doc)); + + QDomElement renderingElem = doc.createElement("RenderingOption"); + std::string text; + rendOpt.serialize(text); + QDomText nd = doc.createTextNode(QString(text.c_str())); + renderingElem.appendChild(nd); + MLRenderingData::GLOptionsType opt; + if (rendOpt.get(opt)) + { + renderingElem.setAttribute("boxColor", QString("%1 %2 %3 %4").arg(opt._perbbox_fixed_color[0]).arg(opt._perbbox_fixed_color[1]).arg(opt._perbbox_fixed_color[2]).arg(opt._perbbox_fixed_color[3])); + renderingElem.setAttribute("pointColor", QString("%1 %2 %3 %4").arg(opt._perpoint_fixed_color[0]).arg(opt._perpoint_fixed_color[1]).arg(opt._perpoint_fixed_color[2]).arg(opt._perpoint_fixed_color[3])); + renderingElem.setAttribute("wireColor", QString("%1 %2 %3 %4").arg(opt._perwire_fixed_color[0]).arg(opt._perwire_fixed_color[1]).arg(opt._perwire_fixed_color[2]).arg(opt._perwire_fixed_color[3])); + renderingElem.setAttribute("solidColor", QString("%1 %2 %3 %4").arg(opt._persolid_fixed_color[0]).arg(opt._persolid_fixed_color[1]).arg(opt._persolid_fixed_color[2]).arg(opt._persolid_fixed_color[3])); + renderingElem.setAttribute("pointSize", opt._perpoint_pointsize); + renderingElem.setAttribute("wireWidth", opt._perwire_wirewidth); + } + meshElem.appendChild(renderingElem); return meshElem; } @@ -218,10 +215,10 @@ QDomElement RasterModelToXML(RasterModel *mp, QDomDocument &doc, bool binary) { QDomElement rasterElem = doc.createElement("MLRaster"); rasterElem.setAttribute("label", mp->label()); - if (binary) - rasterElem.appendChild(WriteShotToQDomNodeBinary(mp->shot, doc)); - else - rasterElem.appendChild(WriteShotToQDomNode(mp->shot, doc)); + if (binary) + rasterElem.appendChild(WriteShotToQDomNodeBinary(mp->shot, doc)); + else + rasterElem.appendChild(WriteShotToQDomNode(mp->shot, doc)); for (int ii = 0; ii < mp->planeList.size(); ++ii) rasterElem.appendChild(PlaneToXML(mp->planeList[ii], mp->par->pathName(), doc)); return rasterElem; @@ -236,7 +233,7 @@ QDomElement PlaneToXML(Plane* pl, const QString& basePath, QDomDocument& doc) return planeElem; } -QDomDocument MeshDocumentToXML(MeshDocument &md, bool onlyVisibleLayers, bool binary, std::map& rendOpt) +QDomDocument MeshDocumentToXML(MeshDocument &md, bool onlyVisibleLayers, bool binary, const std::map& rendOpt) { QDomDocument ddoc("MeshLabDocument"); @@ -246,13 +243,13 @@ QDomDocument MeshDocumentToXML(MeshDocument &md, bool onlyVisibleLayers, bool bi foreach(MeshModel *mmp, md.meshList) { - if ((!onlyVisibleLayers) || (mmp->visible)) + if ((!onlyVisibleLayers) || (mmp->visible)) { - QDomElement meshElem; - if (rendOpt.find(mmp->id()) != rendOpt.end()) - meshElem = MeshModelToXML(mmp, ddoc, binary, &rendOpt[mmp->id()]); - else - meshElem = MeshModelToXML(mmp, ddoc, binary); + QDomElement meshElem; + if (rendOpt.find(mmp->id()) != rendOpt.end()) + meshElem = MeshModelToXML(mmp, ddoc, binary, rendOpt.at(mmp->id())); + else + meshElem = MeshModelToXML(mmp, ddoc, binary); mgroot.appendChild(meshElem); } } diff --git a/src/common/meshlabdocumentxml.h b/src/common/meshlabdocumentxml.h index 125d4d224..d9610bde5 100644 --- a/src/common/meshlabdocumentxml.h +++ b/src/common/meshlabdocumentxml.h @@ -1,9 +1,16 @@ #ifndef __MESHLABDOC_XML_H #define __MESHLABDOC_XML_H -QDomDocument MeshDocumentToXML(MeshDocument &md, bool onlyVisibleLayers, bool binary, std::map& rendOpt = std::map()); -bool MeshDocumentToXMLFile(MeshDocument &md, QString filename, bool onlyVisibleLayers, bool binary, std::map& rendOpt = std::map()); -bool MeshDocumentFromXML(MeshDocument &md, QString filename, bool binary, std::map& rendOpt = std::map()); +#include + +#include "ml_shared_data_context.h" +#include "meshmodel.h" +#include + + +QDomDocument MeshDocumentToXML(MeshDocument &md, bool onlyVisibleLayers, bool binary, const std::map& rendOpt = std::map()); +bool MeshDocumentToXMLFile(MeshDocument &md, QString filename, bool onlyVisibleLayers, bool binary, const std::map& rendOpt = std::map()); +bool MeshDocumentFromXML(MeshDocument &md, QString filename, bool binary, std::map& rendOpt); QDomElement RasterModelToXML(RasterModel *mp,QDomDocument &doc, bool binary); QDomElement PlaneToXML(Plane* pl,const QString& basePath,QDomDocument& doc); #endif // __MESHLABDOC_XML_H diff --git a/src/common/ml_shared_data_context.h b/src/common/ml_shared_data_context.h index a139be3c2..ad50ab55d 100644 --- a/src/common/ml_shared_data_context.h +++ b/src/common/ml_shared_data_context.h @@ -122,7 +122,7 @@ struct MLPerViewGLOptions : public vcg::RenderingModalityGLOptions } - size_t serialize(std::string& str) + size_t serialize(std::string& str) const { str.append(((_visible) ? "1" : "0")); str.append(((_perbbox_quoted_info_enabled) ? "1" : "0")); diff --git a/src/external/OpenCTM-1.0.3/openctm.pro b/src/external/OpenCTM-1.0.3/openctm.pro index d7f2ef5af..b1f8662f2 100644 --- a/src/external/OpenCTM-1.0.3/openctm.pro +++ b/src/external/OpenCTM-1.0.3/openctm.pro @@ -12,6 +12,8 @@ win32-msvc2010:QMAKE_CXXFLAGS += /nologo /Ox /W3 /c /DOPENCTM_STATIC /D_CRT_SECU win32-msvc2012:QMAKE_CXXFLAGS += /nologo /Ox /W3 /c /DOPENCTM_STATIC /D_CRT_SECURE_NO_WARNINGS win32-msvc2015:QMAKE_CXXFLAGS += /nologo /Ox /W3 /c /DOPENCTM_STATIC /D_CRT_SECURE_NO_WARNINGS win32-msvc2015:DEFINES += OPENCTM_STATIC +win32-msvc:QMAKE_CXXFLAGS += /nologo /Ox /W3 /c /DOPENCTM_STATIC /D_CRT_SECURE_NO_WARNINGS +win32-msvc:DEFINES += OPENCTM_STATIC win32-g++:QMAKE_CXXFLAGS += -O3 -W -Wall -c -std=c99 -pedantic win32-g++:DEFINES += OPENCTM_STATIC linux-g++:QMAKE_CXXFLAGS += -O3 -W -Wall -c -std=c99 -pedantic diff --git a/src/external/ext_common.pri b/src/external/ext_common.pri index 147779085..7ee684761 100644 --- a/src/external/ext_common.pri +++ b/src/external/ext_common.pri @@ -6,7 +6,9 @@ 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-msvc:DESTDIR = $$EXTERNAL_BASE_PATH/lib/win32-msvc win32-msvc2015:DEFINES += _CRT_SECURE_NO_WARNINGS +win32-msvc:DEFINES += _CRT_SECURE_NO_WARNINGS linux-g++:DESTDIR = $$EXTERNAL_BASE_PATH/lib/linux-g++ linux-g++-32:DESTDIR = $$EXTERNAL_BASE_PATH/lib/linux-g++-32 linux-g++-64:DESTDIR = $$EXTERNAL_BASE_PATH/lib/linux-g++-64 diff --git a/src/meshlab/meshlab.pro b/src/meshlab/meshlab.pro index f551c2f1b..f6a1d7ee3 100644 --- a/src/meshlab/meshlab.pro +++ b/src/meshlab/meshlab.pro @@ -125,6 +125,7 @@ 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 +win32-msvc:DEFINES += _CRT_SECURE_NO_DEPRECATE # Uncomment these if you want to experiment with newer gcc compilers # (here using the one provided with macports) @@ -143,6 +144,7 @@ win32-msvc2010:LIBS += -L../external/lib/win32-msvc2010 -ljhead -L../distrib -l 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-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) { diff --git a/src/shared.pri b/src/shared.pri index 265b52915..06f19f932 100644 --- a/src/shared.pri +++ b/src/shared.pri @@ -17,6 +17,7 @@ mac:LIBS += ../../common/libcommon.dylib 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 @@ -24,6 +25,7 @@ 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 # uncomment to try Eigen # DEFINES += VCG_USE_EIGEN @@ -42,6 +44,7 @@ DEPENDPATH += ../.. $$VCGDIR # 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