diff options
| author | Marius Kintel <marius@kintel.net> | 2012-07-17 01:55:31 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-07-17 01:55:31 (GMT) |
| commit | 3267ba2d56b5803a5622ba644aa2077a9a93d1c9 (patch) | |
| tree | 6f5c7f509ccd241a02c459c113831a6bfc42af84 /openscad.pro | |
| parent | 9044f7a064adf5a9c8da051ef340537671486d37 (diff) | |
| parent | d7e40ae907d0978079a86d39f0badc9d8141957e (diff) | |
Merge pull request #146 from openscad/mingwcross1
Mingwcross1
Diffstat (limited to 'openscad.pro')
| -rw-r--r-- | openscad.pro | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/openscad.pro b/openscad.pro index 97f20e6..68aa1cc 100644 --- a/openscad.pro +++ b/openscad.pro @@ -103,10 +103,6 @@ netbsd* { QMAKE_CXXFLAGS *= -fno-strict-aliasing } -CONFIG(mingw-cross-env) { - include(mingw-cross-env.pri) -} - CONFIG(skip-version-check) { # force the use of outdated libraries DEFINES += OPENSCAD_SKIP_VERSION_CHECK @@ -130,6 +126,11 @@ DEFINES += USE_PROGRESSWIDGET include(common.pri) +# mingw has to come after other items so OBJECT_DIRS will work properly +CONFIG(mingw-cross-env) { + include(mingw-cross-env.pri) +} + win32 { FLEXSOURCES = src/lexer.l BISONSOURCES = src/parser.y |