More changes due to directory updates

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@108 fdac6126-5c0c-442c-9429-916003d36597
2009-04-30 13:18:48 +00:00
parent 9e05628855
commit da999efc93
13 changed files with 30 additions and 73 deletions
--- 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 += ../../..

--- 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 += ../../..

--- 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()
--- 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 += ../../..

--- 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 += ../../..

--- 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 += ../../..

--- 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 += ../../..

--- 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 += ../../../..

--- 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 += ../../../..

--- 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 += ../../../..

--- 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()