From b1bc6d51612d0abe9ed6ca23032d063753307f9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20M=C3=B6bius?= <moebius@cs.rwth-aachen.de>
Date: Fri, 6 Feb 2009 16:14:52 +0000
Subject: [PATCH] Fixed problem building multiple apps in one dir for
 Subdivider

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@5 fdac6126-5c0c-442c-9429-916003d36597
---
 Apps/Subdivider/Subdivider.pro                | 19 +++-----------
 Apps/Subdivider/commandline/commandline.pro   | 26 +++++++++++++++++++
 .../commandlineAdaptive.pro                   | 26 +++++++++++++++++++
 Apps/Subdivider/gui/gui.pro                   | 26 +++++++++++++++++++
 4 files changed, 82 insertions(+), 15 deletions(-)
 create mode 100644 Apps/Subdivider/commandline/commandline.pro
 create mode 100644 Apps/Subdivider/commandlineAdaptive/commandlineAdaptive.pro
 create mode 100644 Apps/Subdivider/gui/gui.pro

diff --git a/Apps/Subdivider/Subdivider.pro b/Apps/Subdivider/Subdivider.pro
index 837e9af1..1cab33be 100644
--- a/Apps/Subdivider/Subdivider.pro
+++ b/Apps/Subdivider/Subdivider.pro
@@ -3,24 +3,13 @@
 ################################################################################
 
 contains( OPENFLIPPER , OpenFlipper ){
-	include( $$TOPDIR/qmake/all.include )
+        include( $$TOPDIR/qmake/all.include )
 } else {
-	include( $$TOPDIR/OpenMesh/qmake/all.include )
+        include( $$TOPDIR/OpenMesh/qmake/all.include )
 }
 
-INCLUDEPATH += ../../..
+Subdirs()
+SUBDIRS  = commandline commandlineAdaptive  gui  
 
-Application()
-glew()
-glut()
-openmesh()
-
-DIRECTORIES = . ../QtViewer
-
-# Input
-HEADERS += $$getFilesFromDir($$DIRECTORIES,*.hh)
-SOURCES += $$getFilesFromDir($$DIRECTORIES,*.cc)
-SOURCES -= ../QtViewer/meshviewer.cc
-FORMS   += $$getFilesFromDir($$DIRECTORIES,*.ui)
 
 ################################################################################
diff --git a/Apps/Subdivider/commandline/commandline.pro b/Apps/Subdivider/commandline/commandline.pro
new file mode 100644
index 00000000..5a78a874
--- /dev/null
+++ b/Apps/Subdivider/commandline/commandline.pro
@@ -0,0 +1,26 @@
+################################################################################
+#
+################################################################################
+
+contains( OPENFLIPPER , OpenFlipper ){
+	include( $$TOPDIR/qmake/all.include )
+} else {
+	include( $$TOPDIR/OpenMesh/qmake/all.include )
+}
+
+INCLUDEPATH += ../../..
+
+Application()
+glew()
+glut()
+openmesh()
+
+DIRECTORIES = .. ../../QtViewer
+
+# Input
+HEADERS += $$getFilesFromDir($$DIRECTORIES,*.hh)
+SOURCES += $$getFilesFromDir($$DIRECTORIES,*.cc)
+SOURCES -= ../../QtViewer/meshviewer.cc ../qtsubdivider.cc ../adaptive_subdivider.cc
+FORMS   += $$getFilesFromDir($$DIRECTORIES,*.ui)
+
+################################################################################
diff --git a/Apps/Subdivider/commandlineAdaptive/commandlineAdaptive.pro b/Apps/Subdivider/commandlineAdaptive/commandlineAdaptive.pro
new file mode 100644
index 00000000..4b7173f7
--- /dev/null
+++ b/Apps/Subdivider/commandlineAdaptive/commandlineAdaptive.pro
@@ -0,0 +1,26 @@
+################################################################################
+#
+################################################################################
+
+contains( OPENFLIPPER , OpenFlipper ){
+	include( $$TOPDIR/qmake/all.include )
+} else {
+	include( $$TOPDIR/OpenMesh/qmake/all.include )
+}
+
+INCLUDEPATH += ../../..
+
+Application()
+glew()
+glut()
+openmesh()
+
+DIRECTORIES = .. ../../QtViewer
+
+# Input
+HEADERS += $$getFilesFromDir($$DIRECTORIES,*.hh)
+SOURCES += $$getFilesFromDir($$DIRECTORIES,*.cc)
+SOURCES -= ../../QtViewer/meshviewer.cc ../qtsubdivider.cc ../subdivider.cc
+FORMS   += $$getFilesFromDir($$DIRECTORIES,*.ui)
+
+################################################################################
diff --git a/Apps/Subdivider/gui/gui.pro b/Apps/Subdivider/gui/gui.pro
new file mode 100644
index 00000000..7f2442a0
--- /dev/null
+++ b/Apps/Subdivider/gui/gui.pro
@@ -0,0 +1,26 @@
+################################################################################
+#
+################################################################################
+
+contains( OPENFLIPPER , OpenFlipper ){
+	include( $$TOPDIR/qmake/all.include )
+} else {
+	include( $$TOPDIR/OpenMesh/qmake/all.include )
+}
+
+INCLUDEPATH += ../../..
+
+Application()
+glew()
+glut()
+openmesh()
+
+DIRECTORIES = .. ../../QtViewer
+
+# Input
+HEADERS += $$getFilesFromDir($$DIRECTORIES,*.hh)
+SOURCES += $$getFilesFromDir($$DIRECTORIES,*.cc)
+SOURCES -= ../../QtViewer/meshviewer.cc ../subdivider.cc ../adaptive_subdivider.cc
+FORMS   += $$getFilesFromDir($$DIRECTORIES,*.ui)
+
+################################################################################