corrected linking on levmar.a to liblevmar.a gcc using "win32-g++:LIBS+= -L../../external/lib/win32-gcc -llevmar"

This commit is contained in:
Nico Pietroni nicopietroni 2009-07-17 17:39:12 +00:00
parent b6b5eda870
commit e4670ab703

View File

@ -28,7 +28,8 @@ SOURCES = ./filter_isoparametrization.cpp \
$$GLEWCODE
TARGET = filter_isoparametrization
INCLUDEPATH += ../../external/levmar-2.3/
INCLUDEPATH += ./ \
../../external/levmar-2.3/
win32-msvc2005:QMAKE_CXXFLAGS += /openmp
win32-msvc2008:QMAKE_CXXFLAGS += /openmp
@ -38,10 +39,10 @@ linux-g++:QMAKE_CXXFLAGS += -fopenmp
win32-msvc.net:LIBS += ../../external/lib/win32-msvc.net/levmar.lib
win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/levmar.lib
win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/levmar.lib
win32-g++:LIBS += ../../external/lib/win32-gcc/levmar.a
linux-g++:LIBS += ../../external/lib/linux-g++/levmar.a
win32-g++:LIBS += -L../../external/lib/win32-gcc -llevmar
linux-g++:LIBS += -L../../external/lib/win32-gcc -llevmar
macx:LIBS += ../../external/lib/macx/liblevmar.a
QMAKE_CXXFLAGS += -fpermissive
CONFIG += opengl
CONFIG += opengl