[BACK]Return to patch-src_SFML_Graphics_Makefile CVS log [TXT][DIR] Up to [local] / ports / devel / sfml / patches

Diff for /ports/devel/sfml/patches/Attic/patch-src_SFML_Graphics_Makefile between version 1.1 and 1.2

version 1.1, 2011/10/27 16:00:46 version 1.2, 2011/10/27 18:28:20
Line 1 
Line 1 
 $OpenBSD$  $OpenBSD$
 --- src/SFML/Graphics/Makefile.orig     Wed Jan 27 17:00:05 2010  --- 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)  @@ -17,7 +17,7 @@ ifeq ($(STATIC), yes)
      INSTALL =       INSTALL =
  else   else
Line 10 
Line 10 
      INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)       INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)
  endif   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)          $(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  -       $(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   $(OBJ): %.o: %.cpp
 -       $(CPP) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2  -       $(CPP) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2
 +       $(CXX) -o $@ -c $< $(CXXFLAGS)  +       $(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  -       $(CC) -o $@ -c $< $(CFLAGSEXT) -DSTBI_FAILURE_USERMSG
   +$(OBJSOIL): %.o: %.c
 +       $(CC) -o $@ -c $< $(CFLAGS) -DSTBI_FAILURE_USERMSG  +       $(CC) -o $@ -c $< $(CFLAGS) -DSTBI_FAILURE_USERMSG
   
  .PHONY: clean mrproper   .PHONY: clean mrproper
Legend:
Removed from v.1.1  
changed lines
  Added in v.1.2
CVSweb