teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Attempting to work around ffmpeg's inconsistent include path nonsense.

Browse source
This commit is contained in:
Nicolay Korslund 2010-08-13 19:27:45 +02:00
parent 160e8655d2
commit dc0c026ce0
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sound/sources/ffmpeg_source.hpp
View file

@ -7,8 +7,8 @@
extern "C" extern "C"
{ {
#include <libavcodec/avcodec.h> #include <avcodec.h>
#include <libavformat/avformat.h> #include <avformat.h>
} }
namespace Mangle { namespace Mangle {

5
sound/tests/Makefile
View file

@ -3,6 +3,7 @@ GCC=g++ -I../ -Wall
all: audiere_source_test ffmpeg_source_test openal_output_test openal_audiere_test openal_ffmpeg_test all: audiere_source_test ffmpeg_source_test openal_output_test openal_audiere_test openal_ffmpeg_test
L_FFMPEG=$(shell pkg-config --libs libavcodec libavformat) L_FFMPEG=$(shell pkg-config --libs libavcodec libavformat)
I_FFMPEG=-I/usr/include/libavcodec -I/usr/include/libavformat
L_OPENAL=$(shell pkg-config --libs openal) L_OPENAL=$(shell pkg-config --libs openal)
L_AUDIERE=-laudiere L_AUDIERE=-laudiere
@ -10,7 +11,7 @@ openal_audiere_test: openal_audiere_test.cpp ../sources/audiere_source.cpp ../ou
$(GCC) $^ -o $@ $(L_AUDIERE) $(L_OPENAL) $(GCC) $^ -o $@ $(L_AUDIERE) $(L_OPENAL)
openal_ffmpeg_test: openal_ffmpeg_test.cpp ../sources/ffmpeg_source.cpp ../outputs/openal_out.cpp openal_ffmpeg_test: openal_ffmpeg_test.cpp ../sources/ffmpeg_source.cpp ../outputs/openal_out.cpp
$(GCC) $^ -o $@ $(L_FFMPEG) $(L_OPENAL) $(GCC) $^ -o $@ $(L_FFMPEG) $(L_OPENAL) $(I_FFMPEG)
openal_output_test: openal_output_test.cpp ../outputs/openal_out.cpp openal_output_test: openal_output_test.cpp ../outputs/openal_out.cpp
$(GCC) $^ -o $@ $(L_OPENAL) $(GCC) $^ -o $@ $(L_OPENAL)
@ -19,7 +20,7 @@ audiere_source_test: audiere_source_test.cpp ../sources/audiere_source.cpp ../..
$(GCC) $^ -o $@ $(L_AUDIERE) $(GCC) $^ -o $@ $(L_AUDIERE)
ffmpeg_source_test: ffmpeg_source_test.cpp ../sources/ffmpeg_source.cpp ffmpeg_source_test: ffmpeg_source_test.cpp ../sources/ffmpeg_source.cpp
$(GCC) $^ -o $@ $(L_FFMPEG) $(GCC) $^ -o $@ $(L_FFMPEG) $(I_FFMPEG)
clean: clean:
rm *_test rm *_test