diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2014-09-20 15:25:47 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2014-09-20 15:30:18 +0200 |
| commit | 13b1fd19091ff6c6387828eac816f91152620346 (patch) | |
| tree | 3ee671eb74be1ad0b64a76746f121179bdab4a12 /facetracknoir | |
| parent | 1c9e60221a52e9419780e81aedfe076ad157d014 (diff) | |
avoid rebuild after commit
Issue: #59
Diffstat (limited to 'facetracknoir')
| -rw-r--r-- | facetracknoir/facetracknoir.cpp | 5 | ||||
| -rw-r--r-- | facetracknoir/facetracknoir.h | 2 | ||||
| -rw-r--r-- | facetracknoir/version.c | 5 |
3 files changed, 8 insertions, 4 deletions
diff --git a/facetracknoir/facetracknoir.cpp b/facetracknoir/facetracknoir.cpp index dfa13577..43c96f13 100644 --- a/facetracknoir/facetracknoir.cpp +++ b/facetracknoir/facetracknoir.cpp @@ -25,7 +25,6 @@ #include "shortcuts.h" #include "tracker.h" #include "curve-config.h" -#include "opentrack-version.h" #include <QFileDialog> #if defined(_WIN32) @@ -581,6 +580,8 @@ void FaceTrackNoIR::exit() { QCoreApplication::exit(0); } +extern "C" volatile const char* opentrack_version; + void FaceTrackNoIR::fill_profile_cbx() { if (looping) @@ -590,7 +591,7 @@ void FaceTrackNoIR::fill_profile_cbx() QString currentFile = settings.value ( "SettingsFile", QCoreApplication::applicationDirPath() + "/settings/default.ini" ).toString(); qDebug() << "Config file now" << currentFile; QFileInfo pathInfo ( currentFile ); - setWindowTitle(QString( OPENTRACK_VERSION " :: ") + pathInfo.fileName()); + setWindowTitle(QString( const_cast<const char*>(opentrack_version) + QStringLiteral(" :: ")) + pathInfo.fileName()); QDir settingsDir( pathInfo.dir() ); QStringList filters; filters << "*.ini"; diff --git a/facetracknoir/facetracknoir.h b/facetracknoir/facetracknoir.h index f6f4afdf..713a51f0 100644 --- a/facetracknoir/facetracknoir.h +++ b/facetracknoir/facetracknoir.h @@ -55,8 +55,6 @@ using namespace options; #include "ftnoir_tracker_base/ftnoir_tracker_base.h" #include "ftnoir_filter_base/ftnoir_filter_base.h" -#include "opentrack-version.h" - class Tracker; // pre-define class to avoid circular includes class FaceTrackNoIR; diff --git a/facetracknoir/version.c b/facetracknoir/version.c new file mode 100644 index 00000000..0ef4ec14 --- /dev/null +++ b/facetracknoir/version.c @@ -0,0 +1,5 @@ +#ifdef IN_VERSION_UNIT +# define IN_CRAPOLA_COMPILE_UNIT +volatile const char* opentrack_version = OPENTRACK_VERSION; +#else +#endif |