diff --git a/src/meshlab/meshlab.pro b/src/meshlab/meshlab.pro index c3fa74cdf..4740853c9 100644 --- a/src/meshlab/meshlab.pro +++ b/src/meshlab/meshlab.pro @@ -24,7 +24,8 @@ SOURCES = main.cpp \ changetexturename.cpp \ ../../../sf/wrap/ply/plylib.cpp\ ../../../sf/wrap/gui/trackball.cpp\ - ../../../sf/wrap/gui/trackmode.cpp + ../../../sf/wrap/gui/trackmode.cpp \ + ../../../code/lib/glew/src/glew.c FORMS = ui/customDialog.ui\ ui/savesnapshotDialog.ui\ @@ -44,9 +45,16 @@ QT += opengl # the awful min/max macros of windows and the limits max win32:DEFINES += NOMINMAX +DEFINES += GLEW_STATIC + INCLUDEPATH += . ../../../sf ../../../code/lib/glew/include CONFIG += stl -win32:LIBS += ../../../code/lib/glew/lib/glew32.lib +#win32:LIBS += ../../../code/lib/glew/lib/glew32.lib +win32-g++{ +#LIBS += glew32 +#LIBPATH += ../../../code/lib/glew/lib/ +} + unix{ LIBS += -lGLEW QMAKE_CC = gcc diff --git a/src/meshlabplugins/meshio/meshio.pro b/src/meshlabplugins/meshio/meshio.pro index ece254b58..93f02e67b 100644 --- a/src/meshlabplugins/meshio/meshio.pro +++ b/src/meshlabplugins/meshio/meshio.pro @@ -15,7 +15,9 @@ SOURCES = meshio.cpp \ TARGET = meshio DESTDIR = ../../meshlab/plugins -win32:LIBS += ../../../../code/lib/lib3ds-1.2.0/lib3ds-120s.lib +#win32:LIBS += ../../../../code/lib/lib3ds-1.2.0/lib3ds-120s.lib + +win32-g++:LIBS += ../../../../code/lib/lib3ds-1.2.0/lib3ds/lib3ds.a # the following line is needed to avoid mismatch between # the awful min/max macros of windows and the limits max