From da999efc9309c62cd6af963096886251e5e3d603 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Thu, 30 Apr 2009 13:18:48 +0000 Subject: [PATCH] More changes due to directory updates git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@108 fdac6126-5c0c-442c-9429-916003d36597 --- .../Decimating/DecimaterGui/DecimaterGui.pro | 8 +++----- .../commandlineDecimater.pro | 6 +----- src/OpenMesh/Apps/QtViewer/QtViewer.pro | 6 +----- src/OpenMesh/Apps/Smoothing/Smoothing.pro | 6 +----- .../Subdivider/SubdividerGui/SubdividerGui.pro | 6 +----- .../commandlineAdaptiveSubdivider.pro | 6 +----- .../commandlineSubdivider.pro | 6 +----- .../Unsupported/VDProgMesh/Analyzer/Analyzer.pro | 6 +----- .../VDProgMesh/Synthesizer/Synthesizer.pro | 6 +----- .../VDProgMesh/mkbalancedpm/mkbalancedpm.pro | 6 +----- src/OpenMesh/Apps/mconvert/mconvert.pro | 9 +++------ src/OpenMesh/Core/Core.pro | 16 ++++++++-------- src/OpenMesh/Tools/Tools.pro | 16 +++++++--------- 13 files changed, 30 insertions(+), 73 deletions(-) diff --git a/src/OpenMesh/Apps/Decimating/DecimaterGui/DecimaterGui.pro b/src/OpenMesh/Apps/Decimating/DecimaterGui/DecimaterGui.pro index 66032c41..68862d4b 100644 --- a/src/OpenMesh/Apps/Decimating/DecimaterGui/DecimaterGui.pro +++ b/src/OpenMesh/Apps/Decimating/DecimaterGui/DecimaterGui.pro @@ -2,11 +2,9 @@ # ################################################################################ -contains( OPENFLIPPER , OpenFlipper ){ - include( $$TOPDIR/qmake/all.include ) -} else { - include( $$TOPDIR/OpenMesh/qmake/all.include ) -} +include( $$TOPDIR/qmake/all.include ) + +Application() INCLUDEPATH += ../../.. diff --git a/src/OpenMesh/Apps/Decimating/commandlineDecimater/commandlineDecimater.pro b/src/OpenMesh/Apps/Decimating/commandlineDecimater/commandlineDecimater.pro index de785838..bf863090 100644 --- a/src/OpenMesh/Apps/Decimating/commandlineDecimater/commandlineDecimater.pro +++ b/src/OpenMesh/Apps/Decimating/commandlineDecimater/commandlineDecimater.pro @@ -2,11 +2,7 @@ # ################################################################################ -contains( OPENFLIPPER , OpenFlipper ){ - include( $$TOPDIR/qmake/all.include ) -} else { - include( $$TOPDIR/OpenMesh/qmake/all.include ) -} +include( $$TOPDIR/qmake/all.include ) INCLUDEPATH += ../../.. diff --git a/src/OpenMesh/Apps/QtViewer/QtViewer.pro b/src/OpenMesh/Apps/QtViewer/QtViewer.pro index 8c7893e9..42fd4ecc 100644 --- a/src/OpenMesh/Apps/QtViewer/QtViewer.pro +++ b/src/OpenMesh/Apps/QtViewer/QtViewer.pro @@ -2,11 +2,7 @@ # ################################################################################ -contains( OPENFLIPPER , OpenFlipper ){ - include( $$TOPDIR/qmake/all.include ) -} else { - include( $$TOPDIR/OpenMesh/qmake/all.include ) -} +include( $$TOPDIR/qmake/all.include ) Application() glew() diff --git a/src/OpenMesh/Apps/Smoothing/Smoothing.pro b/src/OpenMesh/Apps/Smoothing/Smoothing.pro index 9d77aace..d6400e88 100644 --- a/src/OpenMesh/Apps/Smoothing/Smoothing.pro +++ b/src/OpenMesh/Apps/Smoothing/Smoothing.pro @@ -2,11 +2,7 @@ # ################################################################################ -contains( OPENFLIPPER , OpenFlipper ){ - include( $$TOPDIR/qmake/all.include ) -} else { - include( $$TOPDIR/OpenMesh/qmake/all.include ) -} +include( $$TOPDIR/qmake/all.include ) INCLUDEPATH += ../../.. diff --git a/src/OpenMesh/Apps/Subdivider/SubdividerGui/SubdividerGui.pro b/src/OpenMesh/Apps/Subdivider/SubdividerGui/SubdividerGui.pro index 4695b7e0..27d05e10 100644 --- a/src/OpenMesh/Apps/Subdivider/SubdividerGui/SubdividerGui.pro +++ b/src/OpenMesh/Apps/Subdivider/SubdividerGui/SubdividerGui.pro @@ -2,11 +2,7 @@ # ################################################################################ -contains( OPENFLIPPER , OpenFlipper ){ - include( $$TOPDIR/qmake/all.include ) -} else { - include( $$TOPDIR/OpenMesh/qmake/all.include ) -} +include( $$TOPDIR/qmake/all.include ) INCLUDEPATH += ../../.. diff --git a/src/OpenMesh/Apps/Subdivider/commandlineAdaptiveSubdivider/commandlineAdaptiveSubdivider.pro b/src/OpenMesh/Apps/Subdivider/commandlineAdaptiveSubdivider/commandlineAdaptiveSubdivider.pro index 667e1359..88bae140 100644 --- a/src/OpenMesh/Apps/Subdivider/commandlineAdaptiveSubdivider/commandlineAdaptiveSubdivider.pro +++ b/src/OpenMesh/Apps/Subdivider/commandlineAdaptiveSubdivider/commandlineAdaptiveSubdivider.pro @@ -2,11 +2,7 @@ # ################################################################################ -contains( OPENFLIPPER , OpenFlipper ){ - include( $$TOPDIR/qmake/all.include ) -} else { - include( $$TOPDIR/OpenMesh/qmake/all.include ) -} +include( $$TOPDIR/qmake/all.include ) INCLUDEPATH += ../../.. diff --git a/src/OpenMesh/Apps/Subdivider/commandlineSubdivider/commandlineSubdivider.pro b/src/OpenMesh/Apps/Subdivider/commandlineSubdivider/commandlineSubdivider.pro index c16bb0fd..f4d941f7 100644 --- a/src/OpenMesh/Apps/Subdivider/commandlineSubdivider/commandlineSubdivider.pro +++ b/src/OpenMesh/Apps/Subdivider/commandlineSubdivider/commandlineSubdivider.pro @@ -2,11 +2,7 @@ # ################################################################################ -contains( OPENFLIPPER , OpenFlipper ){ - include( $$TOPDIR/qmake/all.include ) -} else { - include( $$TOPDIR/OpenMesh/qmake/all.include ) -} +include( $$TOPDIR/qmake/all.include ) INCLUDEPATH += ../../.. diff --git a/src/OpenMesh/Apps/Unsupported/VDProgMesh/Analyzer/Analyzer.pro b/src/OpenMesh/Apps/Unsupported/VDProgMesh/Analyzer/Analyzer.pro index 26505412..b93a0cbb 100644 --- a/src/OpenMesh/Apps/Unsupported/VDProgMesh/Analyzer/Analyzer.pro +++ b/src/OpenMesh/Apps/Unsupported/VDProgMesh/Analyzer/Analyzer.pro @@ -2,11 +2,7 @@ # ################################################################################ -contains( OPENFLIPPER , OpenFlipper ){ - include( $$TOPDIR/qmake/all.include ) -} else { - include( $$TOPDIR/OpenMesh/qmake/all.include ) -} +include( $$TOPDIR/qmake/all.include ) INCLUDEPATH += ../../../.. diff --git a/src/OpenMesh/Apps/Unsupported/VDProgMesh/Synthesizer/Synthesizer.pro b/src/OpenMesh/Apps/Unsupported/VDProgMesh/Synthesizer/Synthesizer.pro index 9347920f..dad78ae1 100644 --- a/src/OpenMesh/Apps/Unsupported/VDProgMesh/Synthesizer/Synthesizer.pro +++ b/src/OpenMesh/Apps/Unsupported/VDProgMesh/Synthesizer/Synthesizer.pro @@ -2,11 +2,7 @@ # ################################################################################ -contains( OPENFLIPPER , OpenFlipper ){ - include( $$TOPDIR/qmake/all.include ) -} else { - include( $$TOPDIR/OpenMesh/qmake/all.include ) -} +include( $$TOPDIR/qmake/all.include ) INCLUDEPATH += ../../../.. diff --git a/src/OpenMesh/Apps/Unsupported/VDProgMesh/mkbalancedpm/mkbalancedpm.pro b/src/OpenMesh/Apps/Unsupported/VDProgMesh/mkbalancedpm/mkbalancedpm.pro index 26505412..b93a0cbb 100644 --- a/src/OpenMesh/Apps/Unsupported/VDProgMesh/mkbalancedpm/mkbalancedpm.pro +++ b/src/OpenMesh/Apps/Unsupported/VDProgMesh/mkbalancedpm/mkbalancedpm.pro @@ -2,11 +2,7 @@ # ################################################################################ -contains( OPENFLIPPER , OpenFlipper ){ - include( $$TOPDIR/qmake/all.include ) -} else { - include( $$TOPDIR/OpenMesh/qmake/all.include ) -} +include( $$TOPDIR/qmake/all.include ) INCLUDEPATH += ../../../.. diff --git a/src/OpenMesh/Apps/mconvert/mconvert.pro b/src/OpenMesh/Apps/mconvert/mconvert.pro index 88445321..69592799 100644 --- a/src/OpenMesh/Apps/mconvert/mconvert.pro +++ b/src/OpenMesh/Apps/mconvert/mconvert.pro @@ -2,15 +2,12 @@ # ################################################################################ -contains( OPENFLIPPER , OpenFlipper ){ - include( $$TOPDIR/qmake/all.include ) -} else { - include( $$TOPDIR/OpenMesh/qmake/all.include ) -} +include( $$TOPDIR/qmake/all.include ) + +Application() INCLUDEPATH += ../../.. -Application() glew() glut() openmesh() diff --git a/src/OpenMesh/Core/Core.pro b/src/OpenMesh/Core/Core.pro index 25edd840..50f52afd 100644 --- a/src/OpenMesh/Core/Core.pro +++ b/src/OpenMesh/Core/Core.pro @@ -2,22 +2,22 @@ # ################################################################################ -contains( OPENFLIPPER , OpenFlipper ){ - include( $$TOPDIR/qmake/all.include ) -} else { - include( $$TOPDIR/OpenMesh/qmake/all.include ) -} +include( $$TOPDIR/qmake/all.include ) Library() +contains( OPENFLIPPER , OpenFlipper ){ + DESTDIR = $${TOPDIR}/OpenMesh/lib +} else { + DESTDIR = $${TOPDIR}/lib +} + + DIRECTORIES = . Geometry IO IO/exporter IO/importer IO/reader IO/writer \ Mesh Mesh/gen System Utils INCLUDEPATH += ../.. - -DESTDIR = $${TOPDIR}/lib - CONFIG( debug, debug|release ){ TARGET = OpenMeshCored } else { diff --git a/src/OpenMesh/Tools/Tools.pro b/src/OpenMesh/Tools/Tools.pro index f540866f..3b64bc60 100644 --- a/src/OpenMesh/Tools/Tools.pro +++ b/src/OpenMesh/Tools/Tools.pro @@ -2,30 +2,28 @@ # ################################################################################ -contains( OPENFLIPPER , OpenFlipper ){ - include( $$TOPDIR/qmake/all.include ) -} else { - include( $$TOPDIR/OpenMesh/qmake/all.include ) -} +include( $$TOPDIR/qmake/all.include ) Library() +contains( OPENFLIPPER , OpenFlipper ){ + DESTDIR = $${TOPDIR}/OpenMesh/lib +} else { + DESTDIR = $${TOPDIR}/lib +} + DIRECTORIES = . Decimater Smoother Subdivider/Adaptive/Composite \ Subdivider/Uniform/Composite Subdivider/Uniform \ Utils INCLUDEPATH += ../.. -DESTDIR = $${TOPDIR}/lib - CONFIG( debug, debug|release ){ TARGET = OpenMeshToolsd } else { TARGET = OpenMeshTools } - - win32 { DEFINES += _USE_MATH_DEFINES NOMINMAX CONFIG += static