Mercurial > mxe-octave

changeset 1312:4e5785e62a10

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix linking issues in package sdl_sound
author Volker Grabsch <vog@notjusthosting.com>
date Sun, 10 Oct 2010 14:07:52 +0200
parents dfc67c276c6b
children b445aadc70d1
files src/sdl_sound.mk
diffstat 1 files changed, 8 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/src/sdl_sound.mk	Sun Oct 10 13:46:35 2010 +0200
+++ b/src/sdl_sound.mk	Sun Oct 10 14:07:52 2010 +0200
@@ -10,7 +10,7 @@
 $(PKG)_FILE     := SDL_sound-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://icculus.org/SDL_sound/
 $(PKG)_URL      := http://icculus.org/SDL_sound/downloads/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc sdl libmikmod ogg vorbis smpeg speex
+$(PKG)_DEPS     := gcc sdl libmikmod ogg vorbis flac speex
 
 define $(PKG)_UPDATE
     wget -q -O- 'http://hg.icculus.org/icculus/SDL_sound/tags' | \
@@ -32,24 +32,23 @@
         --enable-au \
         --enable-shn \
         --enable-midi \
-        --enable-smpeg \
+        --disable-smpeg \
         --enable-mpglib \
         --enable-mikmod \
-        --enable-modplug \
+        --disable-modplug \
         --enable-ogg \
         --enable-flac \
         --enable-speex \
-        --enable-physfs \
+        --disable-physfs \
         --disable-altcvt \
-        LIBS='-lvorbis -logg' \
+        LIBS="`'$(TARGET)-pkg-config' vorbisfile flac speex --libs` `'$(PREFIX)/$(TARGET)/bin/libmikmod-config' --libs`" \
         CFLAGS='-fno-inline'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
-    
+
     '$(TARGET)-gcc' \
         -W -Wall -Werror -std=c99 -pedantic \
         '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-sdl_sound.exe' \
-        `'$(TARGET)-pkg-config' sdl --cflags --libs` \
         -lSDL_sound \
-        `'$(TARGET)-pkg-config' vorbisfile --libs` \
-        -lspeex -lmikmod
+        `'$(TARGET)-pkg-config' sdl vorbisfile flac speex --cflags --libs` \
+        `'$(PREFIX)/$(TARGET)/bin/libmikmod-config' --cflags --libs`
 endef