Merge branch 'master' of git://gitorious.impa.br/pano/pano (07a1744f) · Commits · Luis Penaranda / panoramic

pano_interface_1.pro

+22 −9

Original line number	Diff line number	Diff line
		@@ -6,6 +6,28 @@

		QT += core gui opengl

		# compiler specific settings
		darwin-g++\|macx-g++\|linux-g++\|win32-g++\|cygwin-g++* {
		QMAKE_CXXFLAGS += -ansi -pedantic -Wno-long-long
		INCLUDEPATH += "C:/MinGW/include"
		DEPENDPATH += "C:/MinGW/include"
		INCLUDEPATH += "C:/Qt/4.8.4-mingw/include"
		DEPENDPATH += "C:/Qt/4.8.4-mingw/include"
		LIBS += -L"C:/MinGW/lib"
		LIBS += -L"C:/MinGW/bin"
		LIBS += -L"C:/Qt/4.8.4-mingw/lib"
		LIBS += -L"C:/Qt/4.8.4-mingw/bin"
		}

		win32-msvc* {
		DEFINES += _CRT_SECURE_NO_WARNINGS
		LIBS += "/nodefaultlib:LIBCMT"
		INCLUDEPATH += "C:/Qt/4.8.4/include"
		DEPENDPATH += "C:/Qt/4.8.4/include"
		LIBS += -L"C:/Qt/4.8.4/lib"
		LIBS += -L"C:/Qt/4.8.4/bin"
		}

		mac {
		LIBS += -L/opt/local/lib
		LIBS += -lpng -lpnm -ljpeg
		@@ -36,15 +58,6 @@ LIBS += -L"C:/Program Files (x86)/glew-1.9.0/lib"
		LIBS += -lglew32s -lfreeglut -lglu32 -lopengl32 -llibnetpbm10
		}

		# compiler specific settings
		darwin-g++\|macx-g++\|linux-g++\|win32-g++\|cygwin-g++* {
		QMAKE_CXXFLAGS += -ansi -pedantic -Wno-long-long
		}
		win32-msvc2003\|win32-msvc2005\|win32-msvc2008\|win32-msvc2010\|win32-msvc2012 {
		DEFINES += _CRT_SECURE_NO_WARNINGS
		LIBS += "/nodefaultlib:LIBCMT"
		}

		TARGET = pano_interface_1
		TEMPLATE = app