Only in SFML-1.6-old/lib: libsfml-graphics.so.1.6 Binary files SFML-1.6-old/lib/libsfml-network.so.1.6 and SFML-1.6/lib/libsfml-network.so.1.6 differ Binary files SFML-1.6-old/lib/libsfml-system.so.1.6 and SFML-1.6/lib/libsfml-system.so.1.6 differ Binary files SFML-1.6-old/lib/libsfml-window.so.1.6 and SFML-1.6/lib/libsfml-window.so.1.6 differ diff -ur SFML-1.6-old/src/SFML/Graphics/ImageLoader.cpp SFML-1.6/src/SFML/Graphics/ImageLoader.cpp --- SFML-1.6-old/src/SFML/Graphics/ImageLoader.cpp 2010-01-27 15:00:05.000000000 +0100 +++ SFML-1.6/src/SFML/Graphics/ImageLoader.cpp 2010-08-16 12:27:33.983627625 +0200 @@ -28,10 +28,10 @@ #include extern "C" { - #include - #include + #include + #include } -#include +#include #include #include Only in SFML-1.6-old/src/SFML/Graphics: ImageLoader.cpp.rej diff -ur SFML-1.6-old/src/SFML/Graphics/Makefile SFML-1.6/src/SFML/Graphics/Makefile --- SFML-1.6-old/src/SFML/Graphics/Makefile 2010-01-27 15:00:05.000000000 +0100 +++ SFML-1.6/src/SFML/Graphics/Makefile 2010-08-16 12:25:13.663501212 +0200 @@ -1,15 +1,5 @@ SRC = $(wildcard *.cpp) -SRCGLEW = $(wildcard ./GLEW/*.c) -SRCJPEG = $(wildcard ./libjpeg/*.c) -SRCPNG = $(wildcard ./libpng/*.c) -SRCSOIL = $(wildcard ./SOIL/*.c) -SRCZLIB = $(wildcard ./zlib/*.c) OBJ = $(SRC:.cpp=.o) -OBJGLEW = $(SRCGLEW:.c=.o) -OBJJPEG = $(SRCJPEG:.c=.o) -OBJPNG = $(SRCPNG:.c=.o) -OBJSOIL = $(SRCSOIL:.c=.o) -OBJZLIB = $(SRCZLIB:.c=.o) ifeq ($(STATIC), yes) LIB = libsfml-graphics-s.a @@ -23,22 +13,19 @@ all: $(LIB) -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) -static -lGLEW -ljpeg -lpng -lsoil -lz -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 -lX11 -lGL +libsfml-graphics.so: $(OBJ) + $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) -lGLEW -ljpeg -lpng -lSOIL -lz -lfreetype -lX11 -lGL $(OBJ): %.o: %.cpp $(CPP) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2 -$(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB): %.o: %.c - $(CC) -o $@ -c $< $(CFLAGSEXT) -DSTBI_FAILURE_USERMSG - .PHONY: clean mrproper clean: - @rm -rf $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) + @rm -rf $(OBJ) mrproper: clean @rm -rf $(LIBNAME) Only in SFML-1.6-old/src/SFML/Graphics: Makefile.rej