From 69d75e233d01a3418fe89d2b8cccffa278029f30 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 16 Dec 2018 23:50:34 +0000 Subject: [PATCH] Enabled build without qt, Ruby and Python --- src/buddies/src/buddy_app.pri | 7 ++++++- src/db/unit_tests/dbTilingProcessor.cc | 7 +++---- src/pyastub/pya.cc | 3 ++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/buddies/src/buddy_app.pri b/src/buddies/src/buddy_app.pri index d5bafd153..5168eb801 100644 --- a/src/buddies/src/buddy_app.pri +++ b/src/buddies/src/buddy_app.pri @@ -10,7 +10,7 @@ include($$PWD/../../app.pri) # On Mac OSX, these buddy tools have to be built as ordinary command line tools; # not as bundles (*.app) mac { - CONFIG -= app_bundle + CONFIG -= app_bundle } # Since the main function is entirely unspecific, we can put it into a common @@ -42,3 +42,8 @@ equals(HAVE_PYTHON, "1") { DEFINES += BD_TARGET=$$TARGET LIBS += $$RUBYLIBFILE + +if(mac|linux*) { + LIBS += -ldl +} + diff --git a/src/db/unit_tests/dbTilingProcessor.cc b/src/db/unit_tests/dbTilingProcessor.cc index 516e5f613..862461b58 100644 --- a/src/db/unit_tests/dbTilingProcessor.cc +++ b/src/db/unit_tests/dbTilingProcessor.cc @@ -22,6 +22,7 @@ #include "tlUnitTest.h" +#include "tlThreads.h" #include "dbTilingProcessor.h" #include "dbTextWriter.h" @@ -32,8 +33,6 @@ #include "dbShapeProcessor.h" #include -#include -#include unsigned int get_rand() { @@ -403,8 +402,8 @@ public: void add (double x) const { - static QMutex lock; - QMutexLocker locker (&lock); + static tl::Mutex lock; + tl::MutexLocker locker (&lock); *mp_sum += x; *mp_n += 1; } diff --git a/src/pyastub/pya.cc b/src/pyastub/pya.cc index d63d44d71..fad0755f0 100644 --- a/src/pyastub/pya.cc +++ b/src/pyastub/pya.cc @@ -22,13 +22,14 @@ #include "pya.h" +#include "tlInternational.h" namespace pya { static void fail (const char *file, int line) { - throw tl::ScriptError (tl::to_string (QObject::tr ("Python support not compiled in")).c_str (), file, line, "missing_feature", std::vector ()); + throw tl::ScriptError (tl::to_string (tr ("Python support not compiled in")).c_str (), file, line, "missing_feature", std::vector ()); } static PythonInterpreter *sp_pya_interpreter = 0;