Fixed all GL samples that where broken by the MacOSX commit

Delicode · Dec 26, 2012 · 3bc1169 · 3bc1169
1 parent 5eebffc
commit 3bc1169
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/Samples/ClosestPointViewer/Viewer.cpp b/Samples/ClosestPointViewer/Viewer.cpp
@@ -18,13 +18,14 @@
 *  limitations under the License.                                            *
 *                                                                            *
 *****************************************************************************/
-#if (XN_PLATFORM == XN_PLATFORM_MACOSX)
-	#include <GLUT/glut.h>
+#include "Viewer.h"
+
+#if (ONI_PLATFORM == ONI_PLATFORM_MACOSX)
+        #include <GLUT/glut.h>
 #else
-	#include <GL/glut.h>
+        #include <GL/glut.h>
 #endif
 
-#include "Viewer.h"
 #include "../Common/OniSampleUtilities.h"
 
 #define GL_WIN_SIZE_X	1280

diff --git a/Samples/MultiDepthViewer/Viewer.cpp b/Samples/MultiDepthViewer/Viewer.cpp
@@ -23,13 +23,14 @@
 	#define _CRT_SECURE_NO_DEPRECATE 1
 #endif
 
-#if (XN_PLATFORM == XN_PLATFORM_MACOSX)
-	#include <GLUT/glut.h>
+#include "Viewer.h"
+
+#if (ONI_PLATFORM == ONI_PLATFORM_MACOSX)
+        #include <GLUT/glut.h>
 #else
-	#include <GL/glut.h>
+        #include <GL/glut.h>
 #endif
 
-#include "Viewer.h"
 #include "../Common/OniSampleUtilities.h"
 
 #define GL_WIN_SIZE_X	1280

diff --git a/Samples/SimpleViewer/Viewer.cpp b/Samples/SimpleViewer/Viewer.cpp
@@ -23,13 +23,14 @@
 	#define _CRT_SECURE_NO_DEPRECATE 1
 #endif
 
-#if (XN_PLATFORM == XN_PLATFORM_MACOSX)
-	#include <GLUT/glut.h>
+#include "Viewer.h"
+
+#if (ONI_PLATFORM == ONI_PLATFORM_MACOSX)
+        #include <GLUT/glut.h>
 #else
-	#include <GL/glut.h>
+        #include <GL/glut.h>
 #endif
 
-#include "Viewer.h"
 #include "../Common/OniSampleUtilities.h"
 
 #define GL_WIN_SIZE_X	1280