# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1334101485 -7200
# Node ID 535762131d349705b843c2208b4eb20684fba144
# Parent  fc1210b8cacfcbaab4f82adab640ed311a7ff91f
fixed to compile on visual studio 2010

diff -r fc1210b8cacf -r 535762131d34 .hgignore
--- a/.hgignore	Wed Apr 11 01:00:40 2012 +0300
+++ b/.hgignore	Wed Apr 11 01:44:45 2012 +0200
@@ -3,3 +3,12 @@
 \.d$
 \.swp$
 ^data
+^debug
+^release
+\.sln$
+\.suo$
+\.vcproj
+\.vcxproj
+\.pdb$
+^ipch
+\.sdf$
diff -r fc1210b8cacf -r 535762131d34 qvolray.pro
--- a/qvolray.pro	Wed Apr 11 01:00:40 2012 +0300
+++ b/qvolray.pro	Wed Apr 11 01:44:45 2012 +0200
@@ -7,7 +7,9 @@
 contains(QMAKE_CXX, g++) {
 	QMAKE_CXXFLAGS += -std=c++0x -pedantic
 }
-LIBS += -lGLEW -limago -lvmath
+
+unix:LIBS += -lGLEW -limago -lvmath
+win32:LIBS += -lglew32 -llibimago2 -llibvmath -llibpng -lzlib -ljpeglib
 
 # Input
 HEADERS += src/sdr.h src/volray.h src/volume.h src/ui.h
diff -r fc1210b8cacf -r 535762131d34 src/volume.cc
--- a/src/volume.cc	Wed Apr 11 01:00:40 2012 +0300
+++ b/src/volume.cc	Wed Apr 11 01:44:45 2012 +0200
@@ -4,13 +4,7 @@
 #include <ctype.h>
 #include <list>
 #include <string>
-
-#ifndef __APPLE__
-#include <GL/gl.h>
-#else
-#include <OpenGL/gl.h>
-#endif
-
+#include <GL/glew.h>
 #include <imago2.h>
 #include "volume.h"
 
@@ -59,7 +53,10 @@
 	img_destroy(&img);
 
 	/* put the volume data into the alpha component */
-	for(auto slice : slist) {
+	//for(auto slice : slist) { // fucking vs2010 doesn't support range-for
+	for(auto iter = slist.begin(); iter != slist.end(); iter++) {
+		auto slice = *iter;
+
 		int x, y, xsz, ysz;
 		float *pixels, *src;