[SCM] Simple and fast multimedia library for C++ branch, master, updated. f3503ec47ab8bd5713eacc84123d9f80bb4e8f2e

[Christoph Egger]

The following commit has been merged in the master branch:
commit f3503ec47ab8bd5713eacc84123d9f80bb4e8f2e
Author: Christoph Egger <Christoph.Egger at gmx.de>
Date:   Tue Jun 17 20:05:10 2008 +0200

     * Linking the libraries as needed

diff --git a/debian/patches/linking_against_all_needed_libs.patch b/debian/patches/linking_against_all_needed_libs.patch
new file mode 100644
index 0000000..2c293ff
--- /dev/null
+++ b/debian/patches/linking_against_all_needed_libs.patch
@@ -0,0 +1,63 @@
+Index: libsfml/src/SFML/Graphics/Makefile
+===================================================================
+--- libsfml.orig/src/SFML/Graphics/Makefile	2008-06-17 19:21:43.000000000 +0200
++++ libsfml/src/SFML/Graphics/Makefile	2008-06-17 19:21:43.000000000 +0200
+@@ -7,7 +7,7 @@
+ all: $(LIB)
+ 
+ libsfml-graphics.so: $(OBJ) $(OBJSOIL)
+-	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBPATH)/$@.$(VERSION) $(OBJ) -lpng -ljpeg $(OBJSOIL) -lfreetype
++	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBPATH)/$@.$(VERSION) $(OBJ) -lpng -ljpeg $(OBJSOIL) -lfreetype -lGL -lGLEW $(LIBPATH)/libsfml-window.so.1
+ 
+ $(OBJ): %.o: %.cpp
+ 	$(CPP) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2
+Index: libsfml/src/SFML/Audio/Makefile
+===================================================================
+--- libsfml.orig/src/SFML/Audio/Makefile	2008-06-17 19:21:42.000000000 +0200
++++ libsfml/src/SFML/Audio/Makefile	2008-06-17 19:21:43.000000000 +0200
+@@ -7,7 +7,7 @@
+ all: $(LIB)
+ 
+ libsfml-audio.so: $(OBJ) $(OBJVORBIS)
+-	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBPATH)/$@.$(VERSION) $(OBJ) $(OBJVORBIS) -lsndfile -lopenal
++	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBPATH)/$@.$(VERSION) $(OBJ) $(OBJVORBIS) -lsndfile -lopenal $(LIBPATH)/libsfml-system.so.1
+ 
+ $(OBJ): %.o: %.cpp
+ 	$(CPP) -o $@ -c $< $(CFLAGS)
+Index: libsfml/src/SFML/Makefile
+===================================================================
+--- libsfml.orig/src/SFML/Makefile	2008-06-17 19:21:42.000000000 +0200
++++ libsfml/src/SFML/Makefile	2008-06-17 19:22:14.000000000 +0200
+@@ -14,16 +14,16 @@
+ sfml-system:
+ 	@(cd ./System && $(MAKE))
+ 
+-sfml-window:
++sfml-window: sfml-system
+ 	@(cd ./Window && $(MAKE))
+ 
+ sfml-network:
+ 	@(cd ./Network && $(MAKE))
+ 
+-sfml-graphics:
++sfml-graphics: sfml-window
+ 	@(cd ./Graphics && $(MAKE))
+ 
+-sfml-audio:
++sfml-audio: sfml-system
+ 	@(cd ./Audio && $(MAKE))
+ 
+ .PHONY: clean mrproper
+Index: libsfml/src/SFML/Window/Makefile
+===================================================================
+--- libsfml.orig/src/SFML/Window/Makefile	2008-06-17 19:22:20.000000000 +0200
++++ libsfml/src/SFML/Window/Makefile	2008-06-17 19:23:01.000000000 +0200
+@@ -5,7 +5,7 @@
+ all: $(LIB)
+ 
+ libsfml-window.so: $(OBJ) $(OBJGLEW)
+-	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBPATH)/$@.$(VERSION) $(OBJ) -lGLEW -lX11 -lXrandr -lGL
++	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBPATH)/$@.$(VERSION) $(OBJ) -lGLEW -lX11 -lXrandr -lGL $(LIBPATH)/libsfml-system.so.1
+ 
+ $(OBJ): %.o: %.cpp
+ 	$(CPP) -o $@ -c $< $(CFLAGS)
diff --git a/debian/patches/series b/debian/patches/series
index 87e8900..0e9e84c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ removing_removed_sources_from_makefiles.patch
 patching_files_as_needed_by_repackaging.patch
 cstring_ftbfs.patch
 building_on_all_arches.patch
+linking_against_all_needed_libs.patch

-- 
Simple and fast multimedia library for C++