Merge branch 'epoxy' into epoxy

Conflicts:
	Makefile.in
	movit.pc.in

diff --git a/Makefile.in b/Makefile.in
index 77ced6c3d048af72ef3799602394615c323cc11b..69fa663c787d254d0379ec463553f062eea5a7e4 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -22,7 +22,7 @@ with_coverage = @with_coverage@
 
 CC=@CC@
 CXX=@CXX@
-CXXFLAGS=-Wall @CXXFLAGS@ -I$(GTEST_DIR)/include @Eigen3_CFLAGS@ @epoxy_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

diff --git a/movit.pc.in b/movit.pc.in
index c57c031e5dba7e884a40471d5b21dc4822b52fc1..20427c6acd4ee123a5832c17546ab4e8900732c6 100644 (file)
--- a/movit.pc.in
+++ b/movit.pc.in
@@ -15,4 +15,4 @@ Requires:
 Conflicts:
 Libs: -lmovit
 Libs.private: @epoxy_LIBS@ @FFTW3_LIBS@
-Cflags: -I${includedir}/movit @Eigen3_CFLAGS@ @GLEW_CFLAGS@ @epoxy_CFLAGS@
+Cflags: -I${includedir}/movit @Eigen3_CFLAGS@ @epoxy_CFLAGS@ @FFTW3_CFLAGS@