From 7a14b9245b977f188340fa65eeea7734e4248db7 Mon Sep 17 00:00:00 2001
From: Matt Williams <matt@miliams.com>
Date: Mon, 23 May 2011 22:45:50 +0200
Subject: [PATCH] Fix compilation of bindings

The bindings now compile but are not complete. SWIG doesn't support
nested classes so the SimpleVolume can't be bound.
---
 library/PolyVoxCore/include/PolyVoxCore/Region.h | 2 +-
 library/bindings/CMakeLists.txt                  | 2 +-
 library/bindings/SimpleVolumeSampler.i           | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/library/PolyVoxCore/include/PolyVoxCore/Region.h b/library/PolyVoxCore/include/PolyVoxCore/Region.h
index 436d6e7c..60ce2ba6 100644
--- a/library/PolyVoxCore/include/PolyVoxCore/Region.h
+++ b/library/PolyVoxCore/include/PolyVoxCore/Region.h
@@ -37,7 +37,7 @@ namespace PolyVox
 	{
 	public:
 
-		const static Region MaxRegion;
+		static const Region MaxRegion;
 
 		Region();
 		Region(const Vector3DInt32& v3dLowerCorner, const Vector3DInt32& v3dUpperCorner);
diff --git a/library/bindings/CMakeLists.txt b/library/bindings/CMakeLists.txt
index 758929eb..598637fd 100644
--- a/library/bindings/CMakeLists.txt
+++ b/library/bindings/CMakeLists.txt
@@ -5,9 +5,9 @@ if(SWIG_FOUND)
 	find_package(PythonLibs)
 	include_directories(${PYTHON_INCLUDE_PATH})
 	include_directories(${PolyVoxCore_SOURCE_DIR}/include ${PolyVoxCore_SOURCE_DIR}/include/PolyVoxCore)
+	link_directories(${PolyVoxCore_BINARY_DIR})
 
 	set(CMAKE_SWIG_FLAGS "")
-	add_definitions(-DSWIG)
 	set_source_files_properties(PolyVoxCore.i PROPERTIES CPLUSPLUS ON)
 	
 	swig_add_module(PolyVoxCore python PolyVoxCore.i)
diff --git a/library/bindings/SimpleVolumeSampler.i b/library/bindings/SimpleVolumeSampler.i
index a48d52bf..16a59eb0 100644
--- a/library/bindings/SimpleVolumeSampler.i
+++ b/library/bindings/SimpleVolumeSampler.i
@@ -5,5 +5,5 @@
 
 %include "SimpleVolume.h"
 
-%template(SimpleVolumeSamplerMaterial8) PolyVox::SimpleVolumeSampler<PolyVox::Material8>;
-%template(SimpleVolumeSamplerDensity8) PolyVox::SimpleVolumeSampler<PolyVox::Density8>;
\ No newline at end of file
+%template(SimpleVolumeSamplerMaterial8) PolyVox::SimpleVolume::Sampler<PolyVox::Material8>;
+%template(SimpleVolumeSamplerDensity8) PolyVox::SimpleVolume::Sampler<PolyVox::Density8>;
\ No newline at end of file