Commit 6b48ca60 authored by Jan Möbius's avatar Jan Möbius

Changed OpenMesh directory structure

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@105 fdac6126-5c0c-442c-9429-916003d36597
parent 70d42888
unix { unix {
TOPDIR = $$system( pwd )/../ TOPDIR = $$system( pwd )/
} }
win32 { win32 {
TOPDIR = $$system( cd )/../ TOPDIR = $$system( cd )/
} }
#use next qmake.cache if it exists #use next qmake.cache if it exists
......
...@@ -6,31 +6,13 @@ contains( OPENFLIPPER , OpenFlipper ){ ...@@ -6,31 +6,13 @@ contains( OPENFLIPPER , OpenFlipper ){
Subdirs() Subdirs()
addSubdirs( Core ) addSubdirs( src/OpenMesh/Core )
addSubdirs( Tools , Core ) addSubdirs( src/OpenMesh/Tools , src/OpenMesh/Core )
addSubdirs( OpenMesh/Apps/commandlineDecimater , Core Tools) addSubdirs( src/OpenMesh/Apps/commandlineDecimater , src/OpenMesh/Core src/OpenMesh/Tools)
addSubdirs( Apps/Decimating/DecimaterGui , Core Tools) addSubdirs( src/OpenMesh/Apps/Decimating/DecimaterGui , src/OpenMesh/Core src/OpenMesh/Tools)
addSubdirs( Apps/mconvert , Core Tools) addSubdirs( src/OpenMesh/Apps/mconvert , src/OpenMesh/Core src/OpenMesh/Tools)
addSubdirs( Apps/QtViewer , Core Tools) addSubdirs( src/OpenMesh/Apps/QtViewer , src/OpenMesh/Core src/OpenMesh/Tools)
addSubdirs( Apps/Smoothing , Core Tools) addSubdirs( src/OpenMesh/Apps/Smoothing , src/OpenMesh/Core src/OpenMesh/Tools)
addSubdirs( Apps/Subdivider/commandlineSubdivider , Core Tools) addSubdirs( src/OpenMesh/Apps/Subdivider/commandlineSubdivider , src/OpenMesh/Core src/OpenMesh/Tools)
addSubdirs( Apps/Subdivider/commandlineAdaptiveSubdivider , Core Tools) addSubdirs( src/OpenMesh/Apps/Subdivider/commandlineAdaptiveSubdivider , src/OpenMesh/Core src/OpenMesh/Tools)
addSubdirs( Apps/Subdivider/SubdividerGui , Core Tools) addSubdirs( src/OpenMesh/Apps/Subdivider/SubdividerGui , src/OpenMesh/Core src/OpenMesh/Tools)
win32 {
!ReleaseBuild{
!DebugBuild {
MAKECMD = c:\qt4\bin\qmake.exe
CORELIST += Core Tools Apps/Decimating/commandlineDecimater Apps/Decimating/DecimaterGui
CORELIST += Apps/mconvert Apps/QtViewer Apps/Smoothing
CORELIST += Apps/Subdivider/SubdividerGui Apps/Subdivider/commandlineSubdivider Apps/Subdivider/commandlineAdaptiveSubdivider
for(entry, CORELIST ): {
message( $$entry )
system( cd $$entry && $$MAKECMD )
}
}
}
}
...@@ -17,8 +17,8 @@ QT += opengl ...@@ -17,8 +17,8 @@ QT += opengl
# TOPDIR has to be specified in a .qmake.cache file in your projects toplevel # TOPDIR has to be specified in a .qmake.cache file in your projects toplevel
# directory # directory
################################################################################ ################################################################################
INCLUDEPATH = $$quote( $${TOPDIR} ) INCLUDEPATH = $$quote( $$TOPDIR/src )
DEPENDPATH = $$quote( $${TOPDIR} ) DEPENDPATH = $$quote( $${TOPDIR}/src )
################################################################################ ################################################################################
# Define header Extension # Define header Extension
...@@ -82,39 +82,6 @@ UI_DIR = tmp/$$BUILDDIRECTORY ...@@ -82,39 +82,6 @@ UI_DIR = tmp/$$BUILDDIRECTORY
# type definitions # type definitions
################################################################################ ################################################################################
# This function sets all parameters required to build a plugin
defineTest(Plugin) {
unix{
TEMPLATE = lib
}
win32 {
TEMPLATE = vclib
TARGET = $$replace(TARGET, - , _)
export(TARGET)
QMAKE_INCDIR += $${TOPDIR}/OpenFlipper/BasePlugin
export(QMAKE_INCDIR)
LIBS+= -L$${TOPDIR}/OpenFlipper/$${BUILDDIRECTORY} -lPluginLib
export(LIBS)
DEPENDPATH += $${TOPDIR}/OpenFlipper/$${BUILDDIRECTORY}
DEFINES += ACGDLL USEACG
export(DEFINES)
export(DEPENDPATH)
glut()
}
macx {
glut()
}
export(TEMPLATE)
CONFIG *= plugin
export(CONFIG)
DESTDIR = $${TOPDIR}/OpenFlipper/Plugins/$${SYSTEMTYPE}/$${ARCHITECTURE}/$${MODE}
export(DESTDIR)
acg()
openmesh()
glew()
defineTargets()
}
defineTest(Library) { defineTest(Library) {
unix{ unix{
TEMPLATE = lib TEMPLATE = lib
......
...@@ -23,10 +23,16 @@ defineTest( glut ) { ...@@ -23,10 +23,16 @@ defineTest( glut ) {
} }
defineTest( openmesh ) { defineTest( openmesh ) {
QMAKE_LIBDIR += $${TOPDIR}/OpenMesh/Tools/lib/$${BUILDDIRECTORY} QMAKE_LIBDIR += $${TOPDIR}/lib/$${BUILDDIRECTORY}
QMAKE_LIBDIR += $${TOPDIR}/OpenMesh/Core/lib/$${BUILDDIRECTORY} QMAKE_LIBDIR += $${TOPDIR}/lib/$${BUILDDIRECTORY}
LIBS += -lTools
LIBS += -lCore CONFIG( debug, debug|release ){
LIBS += -lOpenMeshToolsd
LIBS += -lOpenMeshCored
} else {
LIBS += -lOpenMeshTools
LIBS += -lOpenMeshCore
}
export(QMAKE_LIBDIR) export(QMAKE_LIBDIR)
export(LIBS) export(LIBS)
} }
...@@ -32,10 +32,17 @@ defineTest( glut ) { ...@@ -32,10 +32,17 @@ defineTest( glut ) {
} }
defineTest( openmesh ) { defineTest( openmesh ) {
QMAKE_LIBDIR += $${TOPDIR}/OpenMesh/Core/lib/$${BUILDDIRECTORY} QMAKE_LIBDIR += $${TOPDIR}/lib/
QMAKE_LIBDIR += $${TOPDIR}/OpenMesh/Tools/lib/$${BUILDDIRECTORY} QMAKE_LIBDIR += $${TOPDIR}/lib/
LIBS+= -Wl,-rpath=$${TOPDIR}/OpenMesh/Core/lib/$${BUILDDIRECTORY} -lCore
LIBS+= -Wl,-rpath=$${TOPDIR}/OpenMesh/Tools/lib/$${BUILDDIRECTORY} -lTools CONFIG( debug, debug|release ){
LIBS+= -Wl,-rpath=$${TOPDIR}/lib -lOpenMeshCored
LIBS+= -Wl,-rpath=$${TOPDIR}/lib -lOpenMeshToolsd
} else {
LIBS+= -Wl,-rpath=$${TOPDIR}/lib -lOpenMeshCore
LIBS+= -Wl,-rpath=$${TOPDIR}/lib -lOpenMeshTools
}
export(QMAKE_LIBDIR) export(QMAKE_LIBDIR)
export(LIBS) export(LIBS)
} }
......
...@@ -58,9 +58,18 @@ defineTest( openmp ) { ...@@ -58,9 +58,18 @@ defineTest( openmp ) {
defineTest( openmesh ) { defineTest( openmesh ) {
DEFINES += _USE_MATH_DEFINES NOMINMAX DEFINES += _USE_MATH_DEFINES NOMINMAX
QMAKE_LIBDIR += $${TOPDIR}/OpenMesh/Core/lib/$${BUILDDIRECTORY}
LIBS+= -L$${TOPDIR}/OpenMesh/Core/lib/$${BUILDDIRECTORY} -lCore QMAKE_LIBDIR += $${TOPDIR}/lib/
LIBS+= -L$${TOPDIR}/OpenMesh/Tools/lib/$${BUILDDIRECTORY} -lTools QMAKE_LIBDIR += $${TOPDIR}/lib/
CONFIG( debug, debug|release ){
LIBS+= -L$${TOPDIR}/lib -lOpenMeshCored
LIBS+= -L$${TOPDIR}/lib -lOpenMeshToolsd
} else {
LIBS+= -L$${TOPDIR}/lib -lOpenMeshCore
LIBS+= -L$${TOPDIR}/lib -lOpenMeshTools
}
export(DEFINES) export(DEFINES)
export(QMAKE_LIBDIR) export(QMAKE_LIBDIR)
export(LIBS) export(LIBS)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment