[Hgengine-cvs] SF.net SVN: hgengine:[236] Mercury2/src

[<cn...@us...>]

Revision: 236
          http://hgengine.svn.sourceforge.net/hgengine/?rev=236&view=rev
Author:   cnlohr
Date:     2009-05-12 06:02:19 +0000 (Tue, 12 May 2009)

Log Message:
-----------
fix up compile on Linux

Modified Paths:
--------------
    Mercury2/src/GLHeaders.h
    Mercury2/src/global.h

Modified: Mercury2/src/GLHeaders.h
===================================================================
--- Mercury2/src/GLHeaders.h	2009-05-12 06:02:07 UTC (rev 235)
+++ Mercury2/src/GLHeaders.h	2009-05-12 06:02:19 UTC (rev 236)
@@ -3,6 +3,8 @@
 
 #ifdef WIN32
 #include <windows.h>
+#else
+#define GL_GLEXT_PROTOTYPES
 #endif
 
 #include <GL/gl.h>
@@ -12,9 +14,8 @@
 #include <freeglut/glut.h>
 #include <OGLExtensions.h>
 #else
-#define GL_GLEXT_PROTOTYPES
 #include <GL/glext.h>
-#include <glut.h>
+#include <GL/freeglut.h>
 #endif
 
 #endif
\ No newline at end of file

Modified: Mercury2/src/global.h
===================================================================
--- Mercury2/src/global.h	2009-05-12 06:02:07 UTC (rev 235)
+++ Mercury2/src/global.h	2009-05-12 06:02:19 UTC (rev 236)
@@ -1,7 +1,10 @@
 #ifndef GLOBAL_H
 #define GLOBAL_H
 
+#ifdef WIN32
 #pragma warning( disable : 4100 )
+#endif
+
 #include <Mint.h>
 
 #endif
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.