=================================================================== RCS file: /cvs/ports/devel/sfml/patches/Attic/patch-src_SFML_Graphics_Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ports/devel/sfml/patches/Attic/patch-src_SFML_Graphics_Makefile 2011/10/27 16:00:46 1.1 +++ ports/devel/sfml/patches/Attic/patch-src_SFML_Graphics_Makefile 2011/10/27 18:28:20 1.2 @@ -1,6 +1,6 @@ -$OpenBSD: patch-src_SFML_Graphics_Makefile,v 1.1 2011/10/27 16:00:46 yason Exp $ +$OpenBSD: patch-src_SFML_Graphics_Makefile,v 1.2 2011/10/27 18:28:20 yason Exp $ --- src/SFML/Graphics/Makefile.orig Wed Jan 27 17:00:05 2010 -+++ src/SFML/Graphics/Makefile Thu Oct 27 19:06:35 2011 ++++ src/SFML/Graphics/Makefile Thu Oct 27 22:17:45 2011 @@ -17,7 +17,7 @@ ifeq ($(STATIC), yes) INSTALL = else @@ -10,19 +10,22 @@ INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB) endif -@@ -27,13 +27,13 @@ libsfml-graphics-s.a: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(O +@@ -26,14 +26,14 @@ all: $(LIB) + 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) +-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 -+ $(CXX) $(LDFLAGS) -Wl,-soname,$(LIB).${LIBsfml-graphics_VERSION} -o $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) -lfreetype -lX11 -lGL ++libsfml-graphics.so: $(OBJ) $(OBJSOIL) ++ $(CXX) $(LDFLAGS) -Wl,-soname,$(LIB).${LIBsfml-graphics_VERSION} -o $(LIBNAME) $(OBJ) $(OBJSOIL) -lfreetype -lX11 -lGL -lGLEW -lpng -ljpeg -lz $(OBJ): %.o: %.cpp - $(CPP) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2 + $(CXX) -o $@ -c $< $(CXXFLAGS) - $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB): %.o: %.c +-$(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB): %.o: %.c - $(CC) -o $@ -c $< $(CFLAGSEXT) -DSTBI_FAILURE_USERMSG ++$(OBJSOIL): %.o: %.c + $(CC) -o $@ -c $< $(CFLAGS) -DSTBI_FAILURE_USERMSG .PHONY: clean mrproper