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/?a=commitdiff_plain;h=926348692a4138e9c88f49ef43657dedb5f36897;hp=-c;p=movit

Merge branch 'epoxy' into epoxy

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

926348692a4138e9c88f49ef43657dedb5f36897
diff --combined Makefile.in
index 77ced6c,cd56fa6..69fa663
--- a/Makefile.in
+++ b/Makefile.in
@@@ -22,14 -22,14 +22,14 @@@ 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
  LDFLAGS=@LDFLAGS@
  LDLIBS=@epoxy_LIBS@ @FFTW3_LIBS@ -lpthread
 -TEST_LDLIBS=@epoxy_LIBS@ @SDL_LIBS@ -lpthread
 -DEMO_LDLIBS=@SDL_image_LIBS@ -lrt -lpthread @libpng_LIBS@ @FFTW3_LIBS@
 +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