Move FOUND_AUDIO_PLAYER above the rest of the audio players to preserve

link ordering.  Also add libaudio_player.a to the final link.

Originally committed to SVN as r2794.
This commit is contained in:
Amar Takhar 2009-04-12 10:52:40 +00:00
parent 41034545e7
commit e6a09d383c
1 changed files with 7 additions and 6 deletions

View File

@ -30,6 +30,13 @@ if BUILD_DARWIN
aegisub_2_1_LDFLAGS += -L/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries
endif
if FOUND_AUDIO_PLAYER
noinst_LIBRARIES += libaudio_player.a
libaudio_player_a_SOURCES = audio_player.cpp
libaudio_player_a_CPPFLAGS = @ALSA_CFLAGS@ @PORTAUDIO_CFLAGS@ @PORTAUDIO2_CFLAGS@ @LIBPULSE_CFLAGS@ @OPENAL_CFLAGS@
aegisub_2_1_LDADD += libaudio_player.a
endif
if HAVE_ALSA
noinst_LIBRARIES += libaudio_alsa.a
libaudio_alsa_a_SOURCES = audio_player_alsa.cpp
@ -69,12 +76,6 @@ aegisub_2_1_LDFLAGS += @OPENAL_LIBS@
aegisub_2_1_LDADD += libaudio_openal.a
endif
if FOUND_AUDIO_PLAYER
noinst_LIBRARIES += libaudio_player.a
libaudio_player_a_SOURCES = audio_player.cpp
libaudio_player_a_CPPFLAGS = @ALSA_CFLAGS@ @PORTAUDIO_CFLAGS@ @PORTAUDIO2_CFLAGS@ @LIBPULSE_CFLAGS@ @OPENAL_CFLAGS@
endif
if HAVE_FFMPEG
aegisub_2_1_LDFLAGS += @LIBAVFORMAT_LIBS@ @LIBAVCODEC_LIBS@ @LIBSWSCALE_LIBS@ @LIBAVUTIL_LIBS@
endif