From 65181c9ad63f2631c0add7fc1a68bf7b3388ac58 Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Sun, 29 Jan 2012 13:20:40 +0100
Subject: Windows compile fix. Fixes #73


diff --git a/src/system-gl.h b/src/system-gl.h
index 76b49e7..0377b72 100644
--- a/src/system-gl.h
+++ b/src/system-gl.h
@@ -4,9 +4,12 @@
 #include <GL/glew.h>
 
 #ifdef __APPLE__
-#include <OpenGL/OpenGL.h>
+ #include <OpenGL/OpenGL.h>
 #else
-#include <GL/gl.h>
+ #include <GL/gl.h>
+ #ifdef _WIN32
+  #include <windows.h> // For the CALLBACK macro
+ #endif
 #endif
 
 #endif
-- 
cgit v0.10.1


From e342fa734a88d9b4e4de21caa70ca81d206ba369 Mon Sep 17 00:00:00 2001
From: Don Bright <hugh.m.bright@gmail.com>
Date: Sun, 29 Jan 2012 07:24:36 -0600
Subject: fix ortho projection bug rept by nop head + Triffid Hunter


diff --git a/src/glview.cc b/src/glview.cc
index 499e555..0f9ec5b 100644
--- a/src/glview.cc
+++ b/src/glview.cc
@@ -371,6 +371,7 @@ void GLView::setupOrtho(double distance, bool offset)
 	glOrtho(-w_h_ratio*l, +w_h_ratio*l,
 			-(1/w_h_ratio)*l, +(1/w_h_ratio)*l,
 			-FAR_FAR_AWAY, +FAR_FAR_AWAY);
+	gluLookAt(0.0, -viewer_distance, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0);
 }
 
 void GLView::paintGL()
@@ -450,8 +451,6 @@ void GLView::paintGL()
 
 		setupOrtho(1000,true);
 
-		gluLookAt(0.0, -1000, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0);
-
 		glMatrixMode(GL_MODELVIEW);
 		glLoadIdentity();
 		glRotated(object_rot_x, 1.0, 0.0, 0.0);
-- 
cgit v0.10.1