From ec12f2216e1daf3cddfe93bdf4e507fa9cff33ce Mon Sep 17 00:00:00 2001
From: Tom Hicks <headhunter3@gmail.com>
Date: Sat, 25 Jun 2005 15:54:39 -0400
Subject: [PATCH] Changed: #ifdef'd windows only stuff Changed: Removed an old
 comment ~g2k

---
 include/main.h | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/include/main.h b/include/main.h
index 0ea6346..816155d 100644
--- a/include/main.h
+++ b/include/main.h
@@ -1,19 +1,21 @@
 #ifndef __main_h__
 #define __main_h__
 
+#ifdef WIN32
 #include <windows.h>			// Header file for windows
-#include <stdio.h>				// Header file for standard input/output
-#include <gl\gl.h>				// Header file for OpenGL32 library
-#include <gl\glu.h>				// Header file for Glu32 library
-#include <gl\glaux.h>			// Header file for GLaux library
+#endif
+#include <cstdio>				// Header file for standard input/output
+#include <GL/gl.h>				// Header file for OpenGL32 library
+#include <GL/glu.h>				// Header file for Glu32 library
 #include <math.h>
 
 #include "camera.h"
 #include "level.h"
-#include "myGL.h"
-#include "WorldDefs.h"
+#include "mygl.h"
+#include "worlddefs.h"
 #include "mydefs.h"
-
+#include "screen.h"
+#include "window.h"
 #pragma warning(disable: 4786)
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Variables
@@ -27,13 +29,17 @@ static bool		fullscreen=true;	// Is window fullscreen flag
 
 
 //static SCREEN g_Screen = {800,600,16,1,"OpenArena"};
+#ifdef WIN32
 static POINT mpos;
+#endif
 static float lastTime = 0.0f;		// This will hold the time from the last frame
 static float currentTime;
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Function Declarations
-LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM);	// Declaration for WndProc
+
+//This shouldn't need to be here
+//LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM);	// Declaration for WndProc
 
 void InitControls();				// Sets up player controls
 int InitGL();						// All setup for OpenGL goes here