diff options
| author | don bright <hugh.m.bright@gmail.com> | 2012-07-15 16:47:18 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2012-07-15 16:47:18 (GMT) |
| commit | cd81cecc3a37de7f3585f5bfaa528f63fcdf5dd9 (patch) | |
| tree | 71c6836cbe6c5b8a2763ddb926f51ee147265a3d /openscad.pro | |
| parent | eb58394e748b3bcca05d85bdacf641f6581b240b (diff) | |
put .o files of cross into separate directory. handle git issue.
Diffstat (limited to 'openscad.pro')
| -rw-r--r-- | openscad.pro | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/openscad.pro b/openscad.pro index 048fbb5..700c392 100644 --- a/openscad.pro +++ b/openscad.pro @@ -17,6 +17,7 @@ isEmpty(QT_VERSION) { error("Please use qmake for Qt 4 (probably qmake-qt4)") } + # Auto-include config_<variant>.pri if the VARIANT variable is give on the # command-line, e.g. qmake VARIANT=mybuild !isEmpty(VARIANT) { @@ -104,10 +105,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 @@ -131,6 +128,11 @@ DEFINES += USE_PROGRESSWIDGET include(common.pri) +# mingw has to 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 @@ -315,3 +317,4 @@ INSTALLS += applications icons.path = $$PREFIX/share/pixmaps icons.files = icons/openscad.png INSTALLS += icons + |