From d96de8e885a7fd381361623fa2ad81022ea78e51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Fri, 6 Feb 2009 16:05:14 +0000 Subject: [PATCH] Fixed problem building multiple apps in one dir for Decimating git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@4 fdac6126-5c0c-442c-9429-916003d36597 --- Apps/Decimating/Decimating.pro | 18 +++---------- Apps/Decimating/commandline/commandline.pro | 28 +++++++++++++++++++++ Apps/Decimating/gui/gui.pro | 28 +++++++++++++++++++++ 3 files changed, 60 insertions(+), 14 deletions(-) create mode 100644 Apps/Decimating/commandline/commandline.pro create mode 100644 Apps/Decimating/gui/gui.pro diff --git a/Apps/Decimating/Decimating.pro b/Apps/Decimating/Decimating.pro index 50cc991a..5b47fd3e 100644 --- a/Apps/Decimating/Decimating.pro +++ b/Apps/Decimating/Decimating.pro @@ -3,23 +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 gui -Application() -glew() -glut() -openmesh() - -DIRECTORIES = . ../QtViewer - -# Input -HEADERS += $$getFilesFromDir($$DIRECTORIES,*.hh) -SOURCES += $$getFilesFromDir($$DIRECTORIES,*.cc) -FORMS += $$getFilesFromDir($$DIRECTORIES,*.ui) ################################################################################ diff --git a/Apps/Decimating/commandline/commandline.pro b/Apps/Decimating/commandline/commandline.pro new file mode 100644 index 00000000..51825b54 --- /dev/null +++ b/Apps/Decimating/commandline/commandline.pro @@ -0,0 +1,28 @@ +################################################################################ +# +################################################################################ + +message(1) + +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 -= ../decimaterviewer.cc ../../QtViewer/meshviewer.cc +FORMS += $$getFilesFromDir($$DIRECTORIES,*.ui) + +################################################################################ diff --git a/Apps/Decimating/gui/gui.pro b/Apps/Decimating/gui/gui.pro new file mode 100644 index 00000000..d994ebfa --- /dev/null +++ b/Apps/Decimating/gui/gui.pro @@ -0,0 +1,28 @@ +################################################################################ +# +################################################################################ + +message(2) + +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 -= ../decimater.cc ../../QtViewer/meshviewer.cc +FORMS += $$getFilesFromDir($$DIRECTORIES,*.ui) + +################################################################################