From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Tue, 18 Mar 2014 23:21:54 +0000 (+0100)
Subject: Merge branch 'epoxy' into epoxy
X-Git-Tag: 1.1~12^2~27
X-Git-Url: https://git.sesse.net/?p=movit;a=commitdiff_plain;h=926348692a4138e9c88f49ef43657dedb5f36897;hp=ee7863d9cdd683dd4df9d6463d98dc59182c54fe

Merge branch 'epoxy' into epoxy

Conflicts:
	Makefile.in
	movit.pc.in
---

diff --git a/Makefile.in b/Makefile.in
index 77ced6c..69fa663 100644
--- 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 c57c031..20427c6 100644
--- 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@