diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2017-06-18 18:09:35 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2017-06-18 18:48:42 +0200 |
| commit | 44ee54d5a2e8edc6b4aaf47a9c3f8d10c9a69052 (patch) | |
| tree | 38c86fd5ef1caabe4bedab2ce67ba9549f419cb8 | |
| parent | 4412c3bcc060b75ae8e77285711d2ad257bd8f9a (diff) | |
csv: link static
| -rw-r--r-- | csv/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | csv/csv.cpp | 6 | ||||
| -rw-r--r-- | csv/csv.h | 4 | ||||
| -rw-r--r-- | csv/export.hpp | 11 |
4 files changed, 5 insertions, 18 deletions
diff --git a/csv/CMakeLists.txt b/csv/CMakeLists.txt index 177db52e..697b147f 100644 --- a/csv/CMakeLists.txt +++ b/csv/CMakeLists.txt @@ -1 +1 @@ -otr_module(csv) +otr_module(csv STATIC) diff --git a/csv/csv.cpp b/csv/csv.cpp index 0f9072a7..66850d7f 100644 --- a/csv/csv.cpp +++ b/csv/csv.cpp @@ -99,8 +99,7 @@ bool CSV::getGameData(int id, unsigned char* table, QString& gamename) QString id_str(QString::number(id)); static const QString csv_path(OPENTRACK_BASE_PATH + - OPENTRACK_DOC_PATH + - QString("settings/facetracknoir supported games.csv")); + OPENTRACK_DOC_PATH "settings/facetracknoir supported games.csv"); QFile file(csv_path); @@ -178,7 +177,8 @@ bool CSV::getGameData(int id, unsigned char* table, QString& gamename) } } - qDebug() << "unknown game connected" << id; + if (id) + qDebug() << "unknown game connected" << id; return false; } @@ -7,9 +7,7 @@ #include <QRegExp> #include <QtGlobal> -#include "export.hpp" - -class OTR_CSV_EXPORT CSV +class CSV { public: QString readLine(); diff --git a/csv/export.hpp b/csv/export.hpp deleted file mode 100644 index 7d7dbe29..00000000 --- a/csv/export.hpp +++ /dev/null @@ -1,11 +0,0 @@ -// generates export.hpp for each module from compat/linkage.hpp - -#pragma once - -#include "compat/linkage-macros.hpp" - -#ifdef BUILD_CSV -# define OTR_CSV_EXPORT OTR_GENERIC_EXPORT -#else -# define OTR_CSV_EXPORT OTR_GENERIC_IMPORT -#endif |