From cedd0432bfe6789445e9031fcd8cd7b27e18ac53 Mon Sep 17 00:00:00 2001
From: = <=>
Date: Thu, 7 May 2015 14:11:17 -0700
Subject: [PATCH 1/2] don't compile SimpleOpenGL3App if NO_OPENGL3 is defined

---
 examples/OpenGLWindow/SimpleOpenGL3App.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/examples/OpenGLWindow/SimpleOpenGL3App.cpp b/examples/OpenGLWindow/SimpleOpenGL3App.cpp
index 905383388..81466bec4 100644
--- a/examples/OpenGLWindow/SimpleOpenGL3App.cpp
+++ b/examples/OpenGLWindow/SimpleOpenGL3App.cpp
@@ -1,3 +1,5 @@
+#ifndef NO_OPENGL3
+
 #include "SimpleOpenGL3App.h"
 #include "ShapeData.h"
 #ifdef __APPLE__
@@ -774,5 +776,5 @@ int SimpleOpenGL3App::getUpAxis() const
 {
 	return m_data->m_upAxis;
 }
-
+#endif//#ifndef NO_OPENGL3
 

From 0e91358e661ca413416d72b3a63df75bd01425c5 Mon Sep 17 00:00:00 2001
From: erwincoumans <erwin.coumans@gmail.com>
Date: Thu, 7 May 2015 15:12:23 -0700
Subject: [PATCH 2/2] attempt to get osx and linux support for travis: disable
 linux specific things

---
 .travis.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 51702f1d9..628563fd7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,16 +5,14 @@ os:
 compiler:
   - gcc
   - clang
-install:
-  - sudo apt-get update
-  - sudo apt-get install libglew-dev
 script:
   - echo "CXX="$CXX
   - echo "CC="$CC
   - cmake . -G "Unix Makefiles" #-DCMAKE_CXX_FLAGS=-Werror
   - make -j8
-  - sudo make install
   # Test again with double precision
   - cmake . -G "Unix Makefiles" -DUSE_DOUBLE_PRECISION=ON #-DCMAKE_CXX_FLAGS=-Werror
   - make -j8
-  - sudo make install
+  # Test again with shared libraries
+  - cmake . -G "Unix Makefiles" -DBUILD_SHARED_LIBS=ON
+  - make -j8