Cycles: first batch of windows build fixes, not quite there yet.

6 files changed, 15 insertions, 7 deletions

diff --git a/intern/cycles/render/CMakeLists.txt b/intern/cycles/render/CMakeLists.txt
index f2342c9032a..9a0583c48aa 100644
--- a/intern/cycles/render/CMakeLists.txt
+++ b/intern/cycles/render/CMakeLists.txt
@@ -1,5 +1,13 @@
 
-INCLUDE_DIRECTORIES(. ../device ../kernel ../kernel/svm ../kernel/osl ../bvh ../util)
+INCLUDE_DIRECTORIES(
+	.
+	../device
+	../kernel
+	../kernel/svm
+	../kernel/osl
+	../bvh
+	../util
+	${GLEW_INCLUDE_PATH})
 
 SET(sources
 	attribute.cpp
diff --git a/intern/cycles/render/buffers.h b/intern/cycles/render/buffers.h
index f31ddd1e9bd..1922f875d86 100644
--- a/intern/cycles/render/buffers.h
+++ b/intern/cycles/render/buffers.h
@@ -28,7 +28,7 @@
 CCL_NAMESPACE_BEGIN
 
 class Device;
-class float4;
+struct float4;
 
 /* Render Buffers */
 
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index 42cadb8faa7..ea1b794b176 100644
--- a/intern/cycles/render/nodes.cpp
+++ b/intern/cycles/render/nodes.cpp
@@ -990,8 +990,8 @@ void BsdfNode::compile(SVMCompiler& compiler, ShaderInput *param1, ShaderInput *
 
 	compiler.add_node(NODE_CLOSURE_BSDF,
 		closure,
-		(param1)? __float_as_int(param1->value.x): 0.0f,
-		(param2)? __float_as_int(param2->value.x): 0.0f);
+		__float_as_int((param1)? param1->value.x: 0.0f),
+		__float_as_int((param2)? param2->value.x: 0.0f));
 }
 
 void BsdfNode::compile(SVMCompiler& compiler)
diff --git a/intern/cycles/render/object.h b/intern/cycles/render/object.h
index ff92b381063..7a12a06853b 100644
--- a/intern/cycles/render/object.h
+++ b/intern/cycles/render/object.h
@@ -31,7 +31,7 @@ class DeviceScene;
 class Mesh;
 class Progress;
 class Scene;
-class Transform;
+struct Transform;
 
 /* Object */
 
diff --git a/intern/cycles/render/shader.h b/intern/cycles/render/shader.h
index 0712100b3e7..cc8bc473a3f 100644
--- a/intern/cycles/render/shader.h
+++ b/intern/cycles/render/shader.h
@@ -35,7 +35,7 @@ class Mesh;
 class Progress;
 class Scene;
 class ShaderGraph;
-class float3;
+struct float3;
 
 /* Shader describing the appearance of a Mesh, Light or Background.
  *
diff --git a/intern/cycles/render/svm.h b/intern/cycles/render/svm.h
index 346d2a73801..f76649e4a6f 100644
--- a/intern/cycles/render/svm.h
+++ b/intern/cycles/render/svm.h
@@ -30,7 +30,7 @@ CCL_NAMESPACE_BEGIN
 class Device;
 class DeviceScene;
 class ImageManager;
-class KernelSunSky;
+struct KernelSunSky;
 class Scene;
 class ShaderGraph;
 class ShaderInput;