Mercurial > hg > classical
changeset 49:a6a71d1c7eb7
* build fixes
| author | Chris Cannam |
|---|---|
| date | Mon, 28 Mar 2011 12:45:26 +0100 |
| parents | 5f23d5b29aaf |
| children | 0f9353a69866 c83cc68483ea |
| files | common/common.pro testapp/Loader.cpp testapp/testapp.pro |
| diffstat | 3 files changed, 21 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/common/common.pro Wed Jun 02 17:29:47 2010 +0100 +++ b/common/common.pro Mon Mar 28 12:45:26 2011 +0100 @@ -1,13 +1,17 @@ TEMPLATE = lib TARGET = -load(../../all.prf) - -DEPENDPATH += ../../svcore -INCLUDEPATH += ../../svcore - CONFIG += staticlib HEADERS += EditDistance.h Objects.h Matcher.h TypeRegistrar.h FeatureFileIndex.h SOURCES += EditDistance.cpp Objects.cpp Matcher.cpp TypeRegistrar.cpp FeatureFileIndex.cpp +exists(./platform.pri) { + include(./platform.pri) +} +!exists(./platform.pri) { + exists(../platform.pri) { + include(../platform.pri) + } +} +
--- a/testapp/Loader.cpp Wed Jun 02 17:29:47 2010 +0100 +++ b/testapp/Loader.cpp Mon Mar 28 12:45:26 2011 +0100 @@ -66,6 +66,7 @@ QObjectList objects; try { objects = loader->loadAll(); +// std::cerr << "Loaded " << objects.size() << " objects" << std::endl; } catch (const std::exception &e) { std::cerr << "mapping failed: " << e.what() << std::endl; return 1;
--- a/testapp/testapp.pro Wed Jun 02 17:29:47 2010 +0100 +++ b/testapp/testapp.pro Mon Mar 28 12:45:26 2011 +0100 @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = testapp -load(../../all.prf) +QT += network SOURCES += Loader.cpp @@ -9,10 +9,16 @@ INCLUDEPATH += ../common -DEPENDPATH += ../../svcore -INCLUDEPATH += ../../svcore - PRE_TARGETDEPS += ../common/libcommon.a -LIBS += ../common/libcommon.a -L../../svcore -lsvcore ../../../dataquay/libdataquay.a +LIBS += ../common/libcommon.a -lsvcore -ldataquay -lrdf +exists(./platform.pri) { + include(./platform.pri) +} +!exists(./platform.pri) { + exists(../platform.pri) { + include(../platform.pri) + } +} +