diff options
| author | Marius Kintel <marius@kintel.net> | 2012-07-15 01:58:55 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-07-15 01:58:55 (GMT) |
| commit | 1b38030f7e243c4eeb288d07084a99ff1e616e85 (patch) | |
| tree | a81f11d55205e0aae12d03f6d5270e4720cd0ad2 /openscad.pro | |
| parent | 13557f1f9a44caccb0546717065ed72c27a210b3 (diff) | |
| parent | 2aaccdcfac97f2bf432f88665261f9b582bbb8b3 (diff) | |
Merge branch 'master' of github.com:openscad/openscad
Diffstat (limited to 'openscad.pro')
| -rw-r--r-- | openscad.pro | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/openscad.pro b/openscad.pro index 591ed5f..048fbb5 100644 --- a/openscad.pro +++ b/openscad.pro @@ -108,6 +108,11 @@ CONFIG(mingw-cross-env) { include(mingw-cross-env.pri) } +CONFIG(skip-version-check) { + # force the use of outdated libraries + DEFINES += OPENSCAD_SKIP_VERSION_CHECK +} + # Application configuration macx:CONFIG += mdi CONFIG += cgal @@ -122,14 +127,7 @@ mdi { DEFINES += ENABLE_MDI } -# FIXME: This can be made default by now -CONFIG += progresswidget -progresswidget { - DEFINES += USE_PROGRESSWIDGET - FORMS += src/ProgressWidget.ui - HEADERS += src/ProgressWidget.h - SOURCES += src/ProgressWidget.cc -} +DEFINES += USE_PROGRESSWIDGET include(common.pri) @@ -145,9 +143,12 @@ RESOURCES = openscad.qrc FORMS += src/MainWindow.ui \ src/Preferences.ui \ - src/OpenCSGWarningDialog.ui + src/OpenCSGWarningDialog.ui \ + src/ProgressWidget.ui -HEADERS += src/parsersettings.h \ +HEADERS += src/version_check.h \ + src/ProgressWidget.h \ + src/parsersettings.h \ src/renderer.h \ src/rendersettings.h \ src/ThrownTogetherRenderer.h \ @@ -203,8 +204,10 @@ HEADERS += src/parsersettings.h \ src/system-gl.h \ src/stl-utils.h -SOURCES += src/mathc99.cc \ - src/linalg.cc \ +SOURCES += src/version_check.cc \ + src/ProgressWidget.cc \ + src/mathc99.cc \ + src/linalg.cc \ src/handle_dep.cc \ src/value.cc \ src/expr.cc \ |