From 41b24a3fde75aa0d2cc964d3fe252b98db842bba Mon Sep 17 00:00:00 2001 From: Mike Kremer Date: Sun, 8 Feb 2009 13:55:31 +0000 Subject: [PATCH] Adapted paths and settings for darwin compatibility git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@9 fdac6126-5c0c-442c-9429-916003d36597 --- qmake/packages/packages.Darwin | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/qmake/packages/packages.Darwin b/qmake/packages/packages.Darwin index 29107b03..25dbd3da 100644 --- a/qmake/packages/packages.Darwin +++ b/qmake/packages/packages.Darwin @@ -9,9 +9,9 @@ defineTest( qt ) { } defineTest( glew ) { - INCLUDEPATH *= /Users/sattler/acg/glew/include/GL + INCLUDEPATH *= /sw/include/GL export(INCLUDEPATH) - LIBS *= -L/Users/sattler/acg/glew/lib -lGLEW + LIBS *= -L/sw/lib -lGLEW export(LIBS) } @@ -22,9 +22,16 @@ defineTest( glut ) { export(LIBS) } -defineTest( openmesh ) { - QMAKE_LIBDIR += $${TOPDIR}/OpenMesh/Core/lib/$${BUILDDIRECTORY} - LIBS+= -install_name$${TOPDIR}/OpenMesh/Core/lib/$${BUILDDIRECTORY} -lCore - export(QMAKE_LIBDIR) - export(LIBS) +defineTest( openmesh ) { + QMAKE_LIBDIR += $${TOPDIR}/OpenMesh/Core/lib/$${BUILDDIRECTORY} + LIBS += -lCore + export(QMAKE_LIBDIR) + export(LIBS) +} + +defineTest( openmesh_tools ) { + QMAKE_LIBDIR += $${TOPDIR}/OpenMesh/Tools/lib/$${BUILDDIRECTORY} + LIBS += -lTools + export(QMAKE_LIBDIR) + export(LIBS) }