diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2016-07-19 06:45:18 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2016-07-19 07:17:26 +0200 |
| commit | ef0a2d3df4324f555a7216c527896e48b59bf59f (patch) | |
| tree | d58e4b16d562a065ca7a40a5f8e45cf09ee92b66 | |
| parent | 5a913e4b663b60d50ae6c38dc5cf3f1c67f26aae (diff) | |
proto/wine: unbreak
| -rw-r--r-- | cmake/opentrack-boilerplate.cmake | 15 | ||||
| -rw-r--r-- | proto-wine/opentrack-wrapper-wine-windows.cxx | 1 |
2 files changed, 10 insertions, 6 deletions
diff --git a/cmake/opentrack-boilerplate.cmake b/cmake/opentrack-boilerplate.cmake index 3b2cadfe..f6f8e8aa 100644 --- a/cmake/opentrack-boilerplate.cmake +++ b/cmake/opentrack-boilerplate.cmake @@ -1,11 +1,14 @@ set(new-hier-path "#pragma once -#include <QCoreApplication> -#include <QString> +#ifndef OPENTRACK_NO_QT_PATH -#define OPENTRACK_BASE_PATH (([]() -> const QString& { \\ - const static QString const__path___ = QCoreApplication::applicationDirPath(); \\ - return const__path___; \\ - })()) +# include <QCoreApplication> +# include <QString> + +# define OPENTRACK_BASE_PATH (([]() -> const QString& { \\ + const static QString const__path___ = QCoreApplication::applicationDirPath(); \\ + return const__path___; \\ + })()) +#endif #define OPENTRACK_LIBRARY_PATH \"${opentrack-hier-path}\" #define OPENTRACK_DOC_PATH \"${opentrack-hier-doc}\" #define OPENTRACK_CONTRIB_PATH \"${opentrack-hier-doc}contrib/\" diff --git a/proto-wine/opentrack-wrapper-wine-windows.cxx b/proto-wine/opentrack-wrapper-wine-windows.cxx index 6604c626..cc8ae63a 100644 --- a/proto-wine/opentrack-wrapper-wine-windows.cxx +++ b/proto-wine/opentrack-wrapper-wine-windows.cxx @@ -6,6 +6,7 @@ #include "opentrack-compat/shm.h" #include "opentrack-compat/shm.cpp" #include "wine-shm.h" +#define OPENTRACK_NO_QT_PATH #include "opentrack-library-path.h" #include <cstring> |