diff options
| author | Marius Kintel <marius@kintel.net> | 2012-01-04 22:29:08 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-01-04 22:29:08 (GMT) |
| commit | 52dfffd97ba49b603b4814d843cd9be08d040364 (patch) | |
| tree | 044c93d19aa38ac24822a241babbece7425bfbb2 /version.pri | |
| parent | 0be212e75d73644b1cff8291a4b6a6fe0098b942 (diff) | |
| parent | ba8aa515d14cf270c9d0fdf50b4c7c55b3c416a8 (diff) | |
Merge branch 'master' into threading
Conflicts:
RELEASE_NOTES
Diffstat (limited to 'version.pri')
| -rw-r--r-- | version.pri | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/version.pri b/version.pri index c94ab82..6b91ecd 100644 --- a/version.pri +++ b/version.pri @@ -1,7 +1,7 @@ # get VERSION from system date isEmpty(VERSION) { - win32-msvc*: { + win32-msvc*:!mingw-cross-env { # # Windows XP date command only has one argument, /t # and it can print the date in various localized formats. @@ -51,17 +51,18 @@ isEmpty(VERSION) { } else { # Unix/Mac VERSION = $$system(date "+%Y.%m.%d") - VERSION_SPLIT=$$split(VERSION, ".") - VERSION_YEAR=$$member(VERSION_SPLIT, 0) - VERSION_MONTH=$$member(VERSION_SPLIT, 1) - VERSION_DAY=$$member(VERSION_SPLIT, 2) } - # Fix for problem with integers with leading zeros - # being interpreted by C++ as octals. Now they're doubles. - VERSION_YEAR=$${VERSION_YEAR}.0 - VERSION_MONTH=$${VERSION_MONTH}.0 - VERSION_DAY=$${VERSION_DAY}.0 } +VERSION_SPLIT=$$split(VERSION, ".") +VERSION_YEAR=$$member(VERSION_SPLIT, 0) +VERSION_MONTH=$$member(VERSION_SPLIT, 1) +VERSION_DAY=$$member(VERSION_SPLIT, 2) +# Fix for problem with integers with leading zeros +# being interpreted by C++ as octals. Now they're doubles. +VERSION_YEAR=$${VERSION_YEAR}.0 +VERSION_MONTH=$${VERSION_MONTH}.0 +VERSION_DAY=$${VERSION_DAY}.0 + DEFINES += OPENSCAD_VERSION=$$VERSION OPENSCAD_YEAR=$$VERSION_YEAR OPENSCAD_MONTH=$$VERSION_MONTH !isEmpty(VERSION_DAY): DEFINES += OPENSCAD_DAY=$$VERSION_DAY |