The following commit has been merged in the master branch:
commit f2122f3aaacd987dae4a3d083940f22227902028
Author: Christoph Egger <[EMAIL PROTECTED]>
Date: Sat May 24 14:47:23 2008 +0200
* Fixed build of stb_vorbis
* fixed useless -lvorbisfile
diff --git a/debian/control b/debian/control
index 877681b..49f46b4 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Games Team <[EMAIL PROTECTED]>
Uploaders: Christoph Egger <[EMAIL PROTECTED]>
Vcs-Git: git://git.debian.org/git/pkg-games/libsfml/
Vcs-Browser: http://git.debian.org/?p=pkg-games/libsfml.git;a=log
-Build-Depends: debhelper (>= 5), libgl1-mesa-glx, mesa-common-dev,
libglu1-mesa-dev, libxrandr-dev, libfreetype6-dev, libopenal-dev,
libsndfile1-dev, zlib1g-dev, libjpeg62-dev, libpng12-dev, libglew1.5-dev,
quilt, libvorbis-dev
+Build-Depends: debhelper (>= 5), libgl1-mesa-glx, mesa-common-dev,
libglu1-mesa-dev, libxrandr-dev, libfreetype6-dev, libopenal-dev,
libsndfile1-dev, zlib1g-dev, libjpeg62-dev, libpng12-dev, libglew1.5-dev, quilt
Standards-Version: 3.7.3
Package: libsfml1-dev
diff --git a/src/SFML/Audio/Makefile b/src/SFML/Audio/Makefile
index 8e136d7..cd42686 100755
--- a/src/SFML/Audio/Makefile
+++ b/src/SFML/Audio/Makefile
@@ -1,13 +1,13 @@
LIB = libsfml-audio.so
SRC = $(wildcard *.cpp)
-#SRCVORBIS = $(wildcard ./stb_vorbis/*.c)
+SRCVORBIS = $(wildcard ./stb_vorbis/*.c)
OBJ = $(SRC:.cpp=.o)
-#OBJVORBIS = $(SRCVORBIS:.c=.o)
+OBJVORBIS = $(SRCVORBIS:.c=.o)
all: $(LIB)
libsfml-audio.so: $(OBJ) $(OBJVORBIS)
- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBPATH)/[EMAIL
PROTECTED](VERSION) $(OBJ) -lvorbisfile -lsndfile -lopenal
+ $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBPATH)/[EMAIL
PROTECTED](VERSION) $(OBJ) $(OBJVORBIS) -lsndfile -lopenal
$(OBJ): %.o: %.cpp
$(CPP) -o $@ -c $< $(CFLAGS)
--
Simple and fast multimedia library for C++
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
