From a6af59445ac716823e359176639f4fa68aa446b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Thu, 30 Apr 2009 13:39:23 +0000 Subject: [PATCH] Fixed mac so names and skipped different build direcotry for openmesh when using openflipper git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@110 fdac6126-5c0c-442c-9429-916003d36597 --- src/OpenMesh/Core/Core.pro | 6 +----- src/OpenMesh/Tools/Tools.pro | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/OpenMesh/Core/Core.pro b/src/OpenMesh/Core/Core.pro index 50f52afd..e7101ba3 100644 --- a/src/OpenMesh/Core/Core.pro +++ b/src/OpenMesh/Core/Core.pro @@ -27,15 +27,11 @@ CONFIG( debug, debug|release ){ win32 { DEFINES += _USE_MATH_DEFINES NOMINMAX CONFIG += static - contains( OPENFLIPPER , OpenFlipper ){ - DESTDIR = $${TOPDIR}/OpenFlipper/$${BUILDDIRECTORY} - message(OpenMesh Library is Building for OpenFlipper ) - } } macx { # Set library binary header to the correct path - QMAKE_LFLAGS_SONAME = -install_name$${LITERAL_WHITESPACE}$${TOPDIR}/OpenMesh/Core/lib/$${BUILDDIRECTORY}/ + QMAKE_LFLAGS_SONAME = -install_name$${LITERAL_WHITESPACE}$${DESTDIR}/ export(QMAKE_LFLAGS_SONAME) } diff --git a/src/OpenMesh/Tools/Tools.pro b/src/OpenMesh/Tools/Tools.pro index 3b64bc60..50933420 100644 --- a/src/OpenMesh/Tools/Tools.pro +++ b/src/OpenMesh/Tools/Tools.pro @@ -31,7 +31,7 @@ win32 { macx { # Set library binary header to the correct path - QMAKE_LFLAGS_SONAME = -install_name$${LITERAL_WHITESPACE}$${TOPDIR}/lib/$${BUILDDIRECTORY}/ + QMAKE_LFLAGS_SONAME = -install_name$${LITERAL_WHITESPACE}$${DESTDIR}/ export(QMAKE_LFLAGS_SONAME) } -- GitLab