Commit 6d3aac13 authored by Jan Möbius's avatar Jan Möbius
Browse files

Fixed cgal and physim

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@4894 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 80b069d0
......@@ -184,9 +184,12 @@ defineTest( cgal ) {
addLib ( /usr/lib $${CGAL_PATH_LIB}, CGAL_PDB ) {
addLib ( /usr/lib $${CGAL_PATH_LIB}, CGAL_Qt4 ) {
# disabled due to compiler errors with gmp
# INCLUDEPATH *= $${CGAL_PATH_INC}
export(INCLUDEPATH)
# disabled due to compiler errors with gmp
#INCLUDEPATH *= $${CGAL_PATH_INC}
#export(INCLUDEPATH)
DEFINES += CGAL_USE_F2C
export(DEFINES)
return(true)
}
......@@ -607,7 +610,7 @@ defineTest( openmesh ) {
defineTest( physim2 ) {
exists( $${TOPDIR}/PhySim ) {
QMAKE_LIBDIR += $${TOPDIR}/PhySim/lib/$${BUILDDIRECTORY}
LIBS+= -lPhySim #-Wl,-rpath=$${TOPDIR}/PhySim/lib/$${BUILDDIRECTORY} -lPhySim
LIBS += -Wl,-rpath=$${TOPDIR}/PhySim/lib/$${BUILDDIRECTORY} -lPhySim
INCLUDEPATH *= $${TOPDIR}/PhySim $${TOPDIR}/PhySim/include
export(QMAKE_LIBDIR)
export(LIBS)
......
Supports Markdown
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