From 21c4bbe7d46c19efe4d49d58c5fb11492275e4fe Mon Sep 17 00:00:00 2001 From: don bright Date: Wed, 14 Dec 2011 02:36:37 -0600 Subject: fix windows MSVC build, fix testing.txt to reflect win32 build 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 +#endif + class Renderer { public: -- cgit v0.10.1