Merge branch 'master' into epoxy
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Mon, 17 Mar 2014 00:46:29 +0000 (01:46 +0100)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Mon, 17 Mar 2014 00:46:29 +0000 (01:46 +0100)
Conflicts:
Makefile.in
movit.pc.in

1  2 
Makefile.in
README
complex_modulate_effect.cpp
configure.ac
movit.pc.in

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 @Eigen3_CFLAGS@ @GLEW_CFLAGS@ @FFTW3_CFLAGS@
 +CXXFLAGS=-Wall @CXXFLAGS@ -I$(GTEST_DIR)/include @SDL2_CFLAGS@ @SDL_CFLAGS@ @Eigen3_CFLAGS@ @epoxy_CFLAGS@ @FFTW3_CFLAGS@
 +ifeq ($(with_SDL2),yes)
 +CXXFLAGS += -DHAVE_SDL2
 +endif
- LDFLAGS=@epoxy_LIBS@ @SDL2_LIBS@ @SDL_LIBS@ @FFTW3_LIBS@ -lpthread
- DEMO_LDLIBS=@SDL2_image_LIBS@ @SDL_image_LIBS@ -lrt -lpthread @libpng_LIBS@ @FFTW3_LIBS@
+ LDFLAGS=@LDFLAGS@
 -LDLIBS=@GLEW_LIBS@ @FFTW3_LIBS@ -lpthread
 -TEST_LDLIBS=@GLEW_LIBS@ @SDL_LIBS@ -lpthread
++LDLIBS=@epoxy_LIBS@ @FFTW3_LIBS@ -lpthread
++TEST_LDLIBS=@epoxy_LIBS@ @SDL_LIBS@ -lpthread
+ DEMO_LDLIBS=@SDL_image_LIBS@ -lrt -lpthread @libpng_LIBS@ @FFTW3_LIBS@
  SHELL=@SHELL@
  LIBTOOL=@LIBTOOL@ --tag=CXX
  RANLIB=ranlib
diff --cc README
Simple merge
Simple merge
diff --cc configure.ac
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@ @epoxy_CFLAGS@ @FFTW3_CFLAGS@