From b365923772012a13e70cc331ccb10bbc4faba2b6 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Fri, 6 Jul 2012 12:58:42 -0700 Subject: [PATCH] use clang++ and mapnik-config by default to build viewer --- demo/viewer/viewer.pro | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/demo/viewer/viewer.pro b/demo/viewer/viewer.pro index 538419e49..048cfad9c 100644 --- a/demo/viewer/viewer.pro +++ b/demo/viewer/viewer.pro @@ -1,18 +1,11 @@ ###################################################################### # Mapnik viewer - Copyright (C) 2007 Artem Pavlenko ###################################################################### -CC = g++ TEMPLATE = app - -INCLUDEPATH += /usr/local/include/ -INCLUDEPATH += /usr/boost/include/ -INCLUDEPATH += /usr/X11/include/ -INCLUDEPATH += /usr/X11/include/freetype2 -INCLUDEPATH += . - -QMAKE_CXXFLAGS +=' -DDARWIN -Wno-missing-field-initializers -ansi' -unix:LIBS = -L/usr/local/lib -L/usr/X11/lib -lmapnik -lfreetype -unix:LIBS += -lboost_system -licuuc -lboost_filesystem -lboost_regex +QMAKE_CXX = clang++ +QMAKE_CXXFLAGS += $$system(mapnik-config --cflags) +QMAKE_LFLAGS += $$system(mapnik-config --libs) +QMAKE_LFLAGS += $$system(mapnik-config --ldflags --dep-libs) # Input