summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/openscad.15
-rw-r--r--doc/testing.txt7
2 files changed, 8 insertions, 4 deletions
diff --git a/doc/openscad.1 b/doc/openscad.1
index a4c03dd..aa03b37 100644
--- a/doc/openscad.1
+++ b/doc/openscad.1
@@ -19,7 +19,7 @@ the OpenSCAD user manual at http://en.wikibooks.org/wiki/OpenSCAD_User_Manual.
.TP
\fB-o\fP \fIoutputfile\fP
-Export the given file to \fIoutputfile\fP in STL, OFF, DXF or CSG format,
+Export the given file to \fIoutputfile\fP in STL, OFF, DXF, CSG, or PNG format,
depending on file extension of \fIoutputfile\fP (which has to be lower case).
If this option is given, the GUI will not be started.
.TP
@@ -40,6 +40,9 @@ More than one \fB-D\fP options can be given.
.TP
.B \-v, \-\-version
Show version of program.
+.TP
+.B \-\-render
+If exporting an image, use a full CGAL render. (Default is an OpenCSG compile)
.SH AUTHOR
OpenSCAD was written by Clifford Wolf, Marius Kintel, and others.
.PP
diff --git a/doc/testing.txt b/doc/testing.txt
index bbd7c18..0b14903 100644
--- a/doc/testing.txt
+++ b/doc/testing.txt
@@ -3,6 +3,9 @@ Running regression tests:
Prerequisites: cmake, python, ImageMagick 6.5.9.3 or newer
+First, get a working qmake GUI build. It is used by the tests.
+Next, get MCAD installed by using 'git submodule update --init'
+
A) Building test environment
Linux, Mac:
@@ -12,9 +15,7 @@ $ make
Windows + MSVC:
-First, get a normal build working by following instructions at
-http://en.wikibooks.org/wiki/OpenSCAD_User_Manual/Building_on_Windows
-Then, from the QT command prompt:
+From the QT command prompt:
> cd tests
> cmake . -DCMAKE_BUILD_TYPE=Release
contact: Jan Huwald // Impressum