diff options
| author | don bright <hugh.m.bright@gmail.com> | 2011-12-14 08:36:37 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2011-12-14 08:36:37 (GMT) |
| commit | 21c4bbe7d46c19efe4d49d58c5fb11492275e4fe (patch) | |
| tree | e6b9ef5df1c8b428a35190c7529243b832efc8f1 | |
| parent | 7781ae7015ae4fd107f6593e831bf6c3101f116f (diff) | |
fix windows MSVC build, fix testing.txt to reflect win32 build
| -rw-r--r-- | doc/testing.txt | 1 | ||||
| -rw-r--r-- | src/renderer.h | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/doc/testing.txt b/doc/testing.txt index d44d801..04768cb 100644 --- a/doc/testing.txt +++ b/doc/testing.txt @@ -61,7 +61,6 @@ $ DISPLAY=:5 ctest environment variables, just like for the main qmake & openscad.pro. Examples: OPENCSGDIR=~/OpenCSG-1.3.2 EIGEN2DIR=~/eigen2 cmake . - CGALDIR=c:\CGAL-3.7 BOOSTDIR=c:\boost_1_46_0 cmake . Valid variables are as follows (see CMakeLists.txt for more info): diff --git a/src/renderer.h b/src/renderer.h index e978080..8deabe8 100644 --- a/src/renderer.h +++ b/src/renderer.h @@ -3,6 +3,10 @@ #include "system-gl.h" +#ifdef _MSC_VER // NULL +#include <cstdlib> +#endif + class Renderer { public: |