diff options
| author | don bright <hugh.m.bright@gmail.com> | 2013-01-26 21:49:37 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2013-01-26 21:49:37 (GMT) |
| commit | d08ebbc6fcea423d6ff2d3be2099d8b34a6c8798 (patch) | |
| tree | b51ac0cb433cf8b65c37a96aae4cd0bb7e4c2833 | |
| parent | fc72c861859feec3f0cf365392cfc60550a4c45a (diff) | |
re-add fstream to header (oops). update some documentation.
| -rw-r--r-- | doc/testing.txt | 7 | ||||
| -rw-r--r-- | src/OffscreenContext.h | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/doc/testing.txt b/doc/testing.txt index bbd7c18..4e061af 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 init --update' + 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 diff --git a/src/OffscreenContext.h b/src/OffscreenContext.h index 3fd8921..500832c 100644 --- a/src/OffscreenContext.h +++ b/src/OffscreenContext.h @@ -2,9 +2,10 @@ #define OFFSCREENCONTEXT_H_ // Here we implement a 'portability' pattern but since we are mixing -// Objective-C with C++, it is a bit different than what's found in a textbook. +// Objective-C with C++, it is a bit different. #include <iostream> +#include <fstream> #include <string> #include "fbo.h" |