Return to patch-src_SFML_Graphics_Makefile CVS log

Up to [local] / ports / devel / sfml / patches

Annotation of ports/devel/sfml/patches/patch-src_SFML_Graphics_Makefile, Revision 1.1.1.1

1.1       yason       1: $OpenBSD$
                      2: --- src/SFML/Graphics/Makefile.orig    Wed Jan 27 17:00:05 2010
                      3: +++ src/SFML/Graphics/Makefile Thu Oct 27 19:06:35 2011
                      4: @@ -17,7 +17,7 @@ ifeq ($(STATIC), yes)
                      5:      INSTALL = 
                      6:  else
                      7:      LIB     = libsfml-graphics.so
                      8: -    LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)
                      9: +    LIBNAME = $(LIBPATH)/$(LIB).${LIBsfml-graphics_VERSION}
                     10:      INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)
                     11:  endif
                     12:  
                     13: @@ -27,13 +27,13 @@ libsfml-graphics-s.a: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(O
                     14:        $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
                     15:  
                     16:  libsfml-graphics.so: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
                     17: -      $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) -lfreetype -lX11 -lGL
                     18: +      $(CXX) $(LDFLAGS) -Wl,-soname,$(LIB).${LIBsfml-graphics_VERSION} -o $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) -lfreetype -lX11 -lGL
                     19:  
                     20:  $(OBJ): %.o: %.cpp
                     21: -      $(CPP) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2
                     22: +      $(CXX) -o $@ -c $< $(CXXFLAGS)
                     23:  
                     24:  $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB): %.o: %.c
                     25: -      $(CC) -o $@ -c $< $(CFLAGSEXT) -DSTBI_FAILURE_USERMSG
                     26: +      $(CC) -o $@ -c $< $(CFLAGS) -DSTBI_FAILURE_USERMSG
                     27:  
                     28:  .PHONY: clean mrproper
                     29:  
                     30: @@ -44,4 +44,4 @@ mrproper: clean
                     31:        @rm -rf $(LIBNAME)
                     32:  
                     33:  install:
                     34: -      @($(CP) $(LIBNAME) $(DESTLIBDIR) $(INSTALL))
                     35: +      $(BSD_INSTALL_DATA) $(LIBNAME) $(DESTLIBDIR)