diff options
| author | Marius Kintel <marius@kintel.net> | 2013-10-04 03:34:59 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-10-04 03:34:59 (GMT) |
| commit | 5ed3e28b7a2e3eccb084cd582e4148a7aebb3b86 (patch) | |
| tree | 132607d2cbf85b9c42a35993d6d44d2c443f8bcc /src | |
| parent | 7273e5b5a967b5625a813f34cda7b2a8382ba4d0 (diff) | |
Mac build fix for openscad_nogui
Diffstat (limited to 'src')
| -rw-r--r-- | src/EventFilter.h | 4 | ||||
| -rw-r--r-- | src/openscad.cc | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/EventFilter.h b/src/EventFilter.h index c3942b5..c883bfd 100644 --- a/src/EventFilter.h +++ b/src/EventFilter.h @@ -1,6 +1,8 @@ #ifndef FILTER_H_ #define FILTER_H_ +#ifdef OPENSCAD_QTGUI + #include <QObject> #include <QFileOpenEvent> #include "MainWindow.h" @@ -25,4 +27,6 @@ protected: } }; +#endif // OPENSCAD_QTGUI + #endif diff --git a/src/openscad.cc b/src/openscad.cc index 6f85c0d..a8bb24a 100644 --- a/src/openscad.cc +++ b/src/openscad.cc @@ -518,7 +518,7 @@ int gui(vector<string> &inputFiles, const fs::path &original_path, int argc, cha } #else // OPENSCAD_QTGUI bool QtUseGUI() { return false; } -int gui(const vector<string> &inputFiles, int argc, char ** argv) +int gui(const vector<string> &inputFiles, const fs::path &original_path, int argc, char ** argv) { fprintf(stderr,"Error: compiled without QT, but trying to run GUI\n"); return 1; @@ -648,7 +648,7 @@ int main(int argc, char **argv) } else { fprintf(stderr, "Requested GUI mode but can't open display!\n"); - return 1; + help(argv[0]); } Builtins::instance(true); |