diff options
| author | DaMichel <mw.pub@welter-4d.de> | 2016-07-06 15:44:30 +0200 |
|---|---|---|
| committer | DaMichel <mw.pub@welter-4d.de> | 2016-07-07 21:57:26 +0200 |
| commit | f8456987d8fe69176bdfd950d72496e213407edf (patch) | |
| tree | b18b743c16ee0cd1e32ba2a17b0820203335b464 | |
| parent | 3794b9b25e09633cb7060b5a29f927dd6006101a (diff) | |
make things compile for me, on M$ VC++ community edition 2015 update 3
| -rwxr-xr-x | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | csv/csv.h | 3 | ||||
| -rw-r--r-- | opentrack-compat/timer.hpp | 2 | ||||
| -rw-r--r-- | opentrack/simple-mat.hpp | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ee5c6c1e..b69f7860 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,9 @@ include(opentrack-qt) include(opentrack-platform) include(opentrack-boilerplate) include(opentrack-version) -include(opentrack-tarball) +if (~MSVC) + include(opentrack-tarball) +endif() include(opentrack-install) set(C CMakeLists.txt) @@ -25,5 +25,6 @@ private: int m_pos; static const QTextCodec* m_codec; - static const QRegExp m_rx, m_rx2; + static const QRegExp m_rx; + static const QRegExp m_rx2; // Silly M$ compiler! It will generate an error if both of these variables are declared on the same line! (M$ Visual Studio Community 2015, Update 3) }; diff --git a/opentrack-compat/timer.hpp b/opentrack-compat/timer.hpp index c048844c..9523c8c9 100644 --- a/opentrack-compat/timer.hpp +++ b/opentrack-compat/timer.hpp @@ -55,7 +55,7 @@ static inline void clock_gettime(int, struct timespec* ts) } # endif #endif -class OPENTRACK_COMPAT_EXPORT Timer +class Timer { private: struct timespec state; diff --git a/opentrack/simple-mat.hpp b/opentrack/simple-mat.hpp index c8e7d903..04cd38ee 100644 --- a/opentrack/simple-mat.hpp +++ b/opentrack/simple-mat.hpp @@ -53,7 +53,7 @@ namespace { } template<typename num, int h_, int w_> -class OPENTRACK_API_EXPORT Mat +class Mat { static_assert(h_ > 0 && w_ > 0, "must have positive mat dimensions"); num data[h_][w_]; |