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

File: [local] / ports / devel / sfml / patches / Attic / patch-src_SFML_Graphics_Makefile (download)

Revision 1.2, Thu Oct 27 18:28:20 2011 UTC (12 years, 8 months ago) by yason
Branch: MAIN
Changes since 1.1: +8 -5 lines

stop using internal lib, use system libs instead

$OpenBSD$
--- src/SFML/Graphics/Makefile.orig	Wed Jan 27 17:00:05 2010
+++ src/SFML/Graphics/Makefile	Thu Oct 27 22:17:45 2011
@@ -17,7 +17,7 @@ ifeq ($(STATIC), yes)
     INSTALL = 
 else
     LIB     = libsfml-graphics.so
-    LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)
+    LIBNAME = $(LIBPATH)/$(LIB).${LIBsfml-graphics_VERSION}
     INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)
 endif
 
@@ -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)
-	$(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(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
-	$(CC) -o $@ -c $< $(CFLAGSEXT) -DSTBI_FAILURE_USERMSG
+$(OBJSOIL): %.o: %.c
+	$(CC) -o $@ -c $< $(CFLAGS) -DSTBI_FAILURE_USERMSG
 
 .PHONY: clean mrproper
 
@@ -44,4 +44,4 @@ mrproper: clean
 	@rm -rf $(LIBNAME)
 
 install:
-	@($(CP) $(LIBNAME) $(DESTLIBDIR) $(INSTALL))
+	$(BSD_INSTALL_DATA) $(LIBNAME) $(DESTLIBDIR)