luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Enabled build without qt, Ruby and Python

This commit is contained in:
Matthias Koefferlein 2018-12-16 23:50:34 +00:00
parent ef0e0d38c2
commit 69d75e233d
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/buddies/src/buddy_app.pri
View File

@ -10,7 +10,7 @@ include($$PWD/../../app.pri)
# On Mac OSX, these buddy tools have to be built as ordinary command line tools; # On Mac OSX, these buddy tools have to be built as ordinary command line tools;
# not as bundles (*.app) # not as bundles (*.app)
mac { mac {
CONFIG -= app_bundle CONFIG -= app_bundle
} }
# Since the main function is entirely unspecific, we can put it into a common # 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 DEFINES += BD_TARGET=$$TARGET
LIBS += $$RUBYLIBFILE LIBS += $$RUBYLIBFILE
if(mac|linux*) {
LIBS += -ldl
}

7
src/db/unit_tests/dbTilingProcessor.cc
View File

@ -22,6 +22,7 @@
#include "tlUnitTest.h" #include "tlUnitTest.h"
#include "tlThreads.h"
#include "dbTilingProcessor.h" #include "dbTilingProcessor.h"
#include "dbTextWriter.h" #include "dbTextWriter.h"
@ -32,8 +33,6 @@
#include "dbShapeProcessor.h" #include "dbShapeProcessor.h"
#include <cstdlib> #include <cstdlib>
#include <QMutex>
#include <QMutexLocker>
unsigned int get_rand() unsigned int get_rand()
{ {
@ -403,8 +402,8 @@ public:
void add (double x) const void add (double x) const
{ {
static QMutex lock; static tl::Mutex lock;
QMutexLocker locker (&lock); tl::MutexLocker locker (&lock);
*mp_sum += x; *mp_sum += x;
*mp_n += 1; *mp_n += 1;
} }

3
src/pyastub/pya.cc
View File

@ -22,13 +22,14 @@
#include "pya.h" #include "pya.h"
#include "tlInternational.h"
namespace pya namespace pya
{ {
static void fail (const char *file, int line) 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<tl::BacktraceElement> ()); throw tl::ScriptError (tl::to_string (tr ("Python support not compiled in")).c_str (), file, line, "missing_feature", std::vector<tl::BacktraceElement> ());
} }
static PythonInterpreter *sp_pya_interpreter = 0; static PythonInterpreter *sp_pya_interpreter = 0;