From 25898425f5d7fcd23a2ea2434b797772446cc582 Mon Sep 17 00:00:00 2001 From: Matt Williams Date: Sun, 29 Mar 2009 00:32:28 +0000 Subject: [PATCH] One or two things towards gettings it working on Linux. At least now it _attempts_ to build the example :) --- examples/OpenGL/CMakeLists.txt | 4 ++-- examples/OpenGL/OpenGLWidget.h | 2 +- examples/OpenGL/main.cpp | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/examples/OpenGL/CMakeLists.txt b/examples/OpenGL/CMakeLists.txt index 0bd0d683..602dc415 100644 --- a/examples/OpenGL/CMakeLists.txt +++ b/examples/OpenGL/CMakeLists.txt @@ -40,7 +40,7 @@ SET(QT_USE_QTGUI 1) SET(QT_USE_QTOPENGL 1) INCLUDE(${QT_USE_FILE}) -IF (WIN32) +#IF (WIN32) FIND_PACKAGE(OpenGL REQUIRED) #NOTE: In Windows I haven't had much luck getting the FindGLUT script to work correctly. @@ -65,4 +65,4 @@ IF (WIN32) ) ADD_DEPENDENCIES(OpenGLExample PolyVoxCore) #This shouldn't be needed -ENDIF (WIN32) \ No newline at end of file +#ENDIF (WIN32) \ No newline at end of file diff --git a/examples/OpenGL/OpenGLWidget.h b/examples/OpenGL/OpenGLWidget.h index c577cccb..87680712 100644 --- a/examples/OpenGL/OpenGLWidget.h +++ b/examples/OpenGL/OpenGLWidget.h @@ -4,7 +4,7 @@ #ifdef WIN32 #include "glew/glew.h" #else -#include // The GL Header File +#include // The GL Header File #endif #include diff --git a/examples/OpenGL/main.cpp b/examples/OpenGL/main.cpp index 2d46930d..fa51a573 100644 --- a/examples/OpenGL/main.cpp +++ b/examples/OpenGL/main.cpp @@ -9,7 +9,9 @@ #include "OpenGLWidget.h" +#ifdef WIN32 #include // Standard Header For Most Programs +#endif #include