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

Christoph Egger Christoph.Egger at gmx.de
Tue Jun 17 18:30:15 UTC 2008


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

     * Modifying patch to use VERSIOn environment variable

diff --git a/debian/patches/linking_against_all_needed_libs.patch b/debian/patches/linking_against_all_needed_libs.patch
index 2c293ff..6e40c75 100644
--- a/debian/patches/linking_against_all_needed_libs.patch
+++ b/debian/patches/linking_against_all_needed_libs.patch
@@ -7,7 +7,7 @@ Index: libsfml/src/SFML/Graphics/Makefile
  
  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
++	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBPATH)/$@.$(VERSION) $(OBJ) -lpng -ljpeg $(OBJSOIL) -lfreetype -lGL -lGLEW $(LIBPATH)/libsfml-window.so.$(VERSION)
  
  $(OBJ): %.o: %.cpp
  	$(CPP) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2
@@ -20,7 +20,7 @@ Index: libsfml/src/SFML/Audio/Makefile
  
  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
++	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBPATH)/$@.$(VERSION) $(OBJ) $(OBJVORBIS) -lsndfile -lopenal $(LIBPATH)/libsfml-system.so.$(VERSION)
  
  $(OBJ): %.o: %.cpp
  	$(CPP) -o $@ -c $< $(CFLAGS)
@@ -57,7 +57,7 @@ Index: libsfml/src/SFML/Window/Makefile
  
  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
++	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBPATH)/$@.$(VERSION) $(OBJ) -lGLEW -lX11 -lXrandr -lGL $(LIBPATH)/libsfml-system.so.$(VERSION)
  
  $(OBJ): %.o: %.cpp
  	$(CPP) -o $@ -c $< $(CFLAGS)

-- 
Simple and fast multimedia library for C++



More information about the Pkg-games-commits mailing list