Merge branch 'master' into epoxy
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Tue, 18 Mar 2014 23:20:55 +0000 (00:20 +0100)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Tue, 18 Mar 2014 23:20:55 +0000 (00:20 +0100)
Conflicts:
Makefile.in
README
movit.pc.in

12 files changed:
1  2 
Makefile.in
README
blur_effect.cpp
complex_modulate_effect.cpp
configure.ac
effect_chain.cpp
effect_chain.h
effect_util.cpp
effect_util.h
movit.pc.in
util.cpp
util.h

diff --cc Makefile.in
@@@ -13,12 -21,11 +22,14 @@@ with_coverage = @with_coverage
  
  CC=@CC@
  CXX=@CXX@
- CXXFLAGS=-Wall @CXXFLAGS@ -I$(GTEST_DIR)/include @SDL2_CFLAGS@ @SDL_CFLAGS@ @Eigen3_CFLAGS@ @epoxy_CFLAGS@ @FFTW3_CFLAGS@
 -CXXFLAGS=-Wall @CXXFLAGS@ -I$(GTEST_DIR)/include @Eigen3_CFLAGS@ @GLEW_CFLAGS@ @FFTW3_CFLAGS@
++CXXFLAGS=-Wall @CXXFLAGS@ -I$(GTEST_DIR)/include @Eigen3_CFLAGS@ @epoxy_CFLAGS@ @FFTW3_CFLAGS@
 +ifeq ($(with_SDL2),yes)
 +CXXFLAGS += -DHAVE_SDL2
 +endif
- LDFLAGS=@epoxy_LIBS@ @SDL2_LIBS@ @SDL_LIBS@ @FFTW3_LIBS@ -lpthread
+ LDFLAGS=@LDFLAGS@
 -LDLIBS=@GLEW_LIBS@ @FFTW3_LIBS@ -lpthread
 -TEST_LDLIBS=@GLEW_LIBS@ @SDL_LIBS@ -lpthread
 -DEMO_LDLIBS=@SDL_image_LIBS@ -lrt -lpthread @libpng_LIBS@ @FFTW3_LIBS@
++LDLIBS=@epoxy_LIBS@ @FFTW3_LIBS@ -lpthread
++TEST_LDLIBS=@epoxy_LIBS@ @SDL2_LIBS@ @SDL_LIBS@ -lpthread
 +DEMO_LDLIBS=@SDL2_image_LIBS@ @SDL_image_LIBS@ -lrt -lpthread @libpng_LIBS@ @FFTW3_LIBS@
  SHELL=@SHELL@
  LIBTOOL=@LIBTOOL@ --tag=CXX
  RANLIB=ranlib
diff --cc README
--- 1/README
--- 2/README
+++ b/README
@@@ -21,13 -21,12 +21,13 @@@ OK, you nee
    works fine on Linux and OS X, and Movit is not very POSIX-bound.)
  * GNU Make.
  * A GPU capable of running GLSL fragment shaders,
 -  process floating-point textures, and a few other things. If your machine
 -  is less than five years old _and you have the appropriate drivers_,
 -  you're home free.
 +  processing floating-point textures, and a few other things (all are
 +  part of OpenGL 3.0 or newer, although most OpenGL 2.0 cards also
 +  have what's needed through extensions). If your machine is less than five
 +  years old _and you have the appropriate drivers_, you're home free.
- * The [Eigen 3] and [Google Test] libraries. (The library itself
-   depends only on the former, but you probably want to run the unit tests.)
+ * The [Eigen 3], [FFTW3] and [Google Test] libraries. (The library itself
+   does not depend on the latter, but you probably want to run the unit tests.)
 -* The [GLEW] library, for dealing with OpenGL extensions on various
 +* The [epoxy] library, for dealing with OpenGL extensions on various
    platforms.
  
  Movit has been tested with Intel GPUs with the Mesa drivers
diff --cc blur_effect.cpp
Simple merge
Simple merge
diff --cc configure.ac
Simple merge
Simple merge
diff --cc effect_chain.h
Simple merge
diff --cc effect_util.cpp
Simple merge
diff --cc effect_util.h
Simple merge
diff --cc movit.pc.in
@@@ -13,5 -13,6 +13,6 @@@ Description: Movit is a library for hig
  Version: git
  Requires:
  Conflicts:
- Libs: -lmovit @epoxy_LIBS@
- Cflags: -I${includedir}/movit @Eigen3_CFLAGS@ @epoxy_CFLAGS@
+ Libs: -lmovit
 -Libs.private: @GLEW_LIBS@ @FFTW3_LIBS@
 -Cflags: -I${includedir}/movit @Eigen3_CFLAGS@ @GLEW_CFLAGS@ @FFTW3_CFLAGS@
++Libs.private: @epoxy_LIBS@ @FFTW3_LIBS@
++Cflags: -I${includedir}/movit @Eigen3_CFLAGS@ @GLEW_CFLAGS@ @epoxy_CFLAGS@
diff --cc util.cpp
+++ b/util.cpp
@@@ -9,6 -9,14 +9,14 @@@
  #include "init.h"
  #include "util.h"
  
 -#include <GL/wglew.h>
+ #if defined(__DARWIN__)
+ #include <OpenGL/OpenGL.h>
+ #elif defined(WIN32)
 -#include <GL/glxew.h>
++#include <epoxy/wgl.h>
+ #else
++#include <epoxy/glx.h>
+ #endif
  using namespace std;
  
  namespace movit {
diff --cc util.h
Simple merge