diff options
Diffstat (limited to 'devel/sfml/files/patch-src-SFML-Graphics-Makefile')
-rw-r--r-- | devel/sfml/files/patch-src-SFML-Graphics-Makefile | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/devel/sfml/files/patch-src-SFML-Graphics-Makefile b/devel/sfml/files/patch-src-SFML-Graphics-Makefile index 40a80caa6645..69fcc9e6bc53 100644 --- a/devel/sfml/files/patch-src-SFML-Graphics-Makefile +++ b/devel/sfml/files/patch-src-SFML-Graphics-Makefile @@ -1,21 +1,21 @@ --- src/SFML/Graphics/Makefile.orig 2010-01-27 17:00:05.000000000 +0300 +++ src/SFML/Graphics/Makefile 2010-08-25 07:07:23.000000000 +0400 @@ -26,14 +26,14 @@ - libsfml-graphics-s.a: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
- $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
-
--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) $(OBJGLEW) $(OBJSOIL)
-+ $(CXX) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJSOIL) -lfreetype -lX11 -lGL -lpng -ljpeg -lz
-
- $(OBJ): %.o: %.cpp
-- $(CPP) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2
-+ $(CXX) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2
-
- $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB): %.o: %.c
-- $(CC) -o $@ -c $< $(CFLAGSEXT) -DSTBI_FAILURE_USERMSG
-+ $(CC) -o $@ -c $< $(CFLAGS) -DSTBI_FAILURE_USERMSG
-
- .PHONY: clean mrproper
-
+ libsfml-graphics-s.a: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) + $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) + +-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) $(OBJGLEW) $(OBJSOIL) ++ $(CXX) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJSOIL) -lfreetype -lX11 -lGL -lpng -ljpeg -lz + + $(OBJ): %.o: %.cpp +- $(CPP) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2 ++ $(CXX) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2 + + $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB): %.o: %.c +- $(CC) -o $@ -c $< $(CFLAGSEXT) -DSTBI_FAILURE_USERMSG ++ $(CC) -o $@ -c $< $(CFLAGS) -DSTBI_FAILURE_USERMSG + + .PHONY: clean mrproper + |