The following commit has been merged in the sfml-ng branch:
commit 0f5822f10ab1480f6bc77199560fc05668de2320
Author: Christoph Egger <[EMAIL PROTECTED]>
Date: Wed Dec 3 17:42:47 2008 +0100
cleaning up patches to get things together that belong together
diff --git a/debian/patches/linking_against_all_needed_libs.patch
b/debian/patches/linking_against_all_needed_libs.patch
index baa14cb..712187b 100644
--- a/debian/patches/linking_against_all_needed_libs.patch
+++ b/debian/patches/linking_against_all_needed_libs.patch
@@ -6,11 +6,11 @@ Index: libsfml/src/SFML/Graphics/Makefile
all: $(LIB)
libsfml-graphics-s.a: $(OBJ)
-- $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) -lpng -ljpeg -lz -lfreetype -lGLEW
-lSOIL
+- $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) -lpng -ljpeg -lfreetype -lGLEW -lSOIL
+ $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) -lpng -ljpeg -lfreetype -lGLEW -lSOIL
libsfml-graphics.so: $(OBJ)
-- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ)
-lpng -ljpeg -lGLEW -lz -lfreetype -lSOIL
+- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ)
-lpng -ljpeg -lGLEW -lfreetype -lSOIL
+ $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ)
-lpng -ljpeg -lGLEW -lfreetype -lSOIL $(LIBPATH)/libsfml-system.so.$(VERSION)
$(LIBPATH)/libsfml-window.so.$(VERSION) -lGL
$(OBJ): %.o: %.cpp
@@ -80,7 +80,7 @@ Index: libsfml/src/SFML/Window/Makefile
+ $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(LIBPATH)/libsfml-syste-s.a
libsfml-window.so: $(OBJ)
-- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ)
-lGLEW -lX11 -lXrandr -lGL
+- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ)
-lX11 -lXrandr -lGL
+ $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ)
-lX11 -lXrandr -lGL $(LIBPATH)/libsfml-system.so.$(VERSION)
$(OBJ): %.o: %.cpp
diff --git a/debian/patches/removing_removed_sources_from_makefiles.patch
b/debian/patches/removing_removed_sources_from_makefiles.patch
index 6217e81..82b3f9f 100644
--- a/debian/patches/removing_removed_sources_from_makefiles.patch
+++ b/debian/patches/removing_removed_sources_from_makefiles.patch
@@ -25,12 +25,12 @@ Index: libsfml/src/SFML/Graphics/Makefile
-libsfml-graphics-s.a: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL)
$(OBJZLIB)
- $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG)
$(OBJSOIL) $(OBJZLIB)
+libsfml-graphics-s.a: $(OBJ)
-+ $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) -lpng -ljpeg -lz -lfreetype -lGLEW
-lSOIL
++ $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) -lpng -ljpeg -lfreetype -lGLEW -lSOIL
-libsfml-graphics.so: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL)
$(OBJZLIB)
- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ)
$(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) -lfreetype
+libsfml-graphics.so: $(OBJ)
-+ $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ)
-lpng -ljpeg -lGLEW -lz -lfreetype -lSOIL
++ $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ)
-lpng -ljpeg -lGLEW -lfreetype -lSOIL
$(OBJ): %.o: %.cpp
$(CPP) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2
@@ -50,7 +50,7 @@ Index: libsfml/src/SFML/Window/Makefile
libsfml-window.so: $(OBJ)
- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ)
$(OBJGLEW) -lX11 -lXrandr -lGL
-+ $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ)
-lGLEW -lX11 -lXrandr -lGL
++ $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ)
-lX11 -lXrandr -lGL
$(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
