31 lines
1.3 KiB
Plaintext
31 lines
1.3 KiB
Plaintext
--- src/SFML/Graphics/Makefile.orig 2014-08-18 16:51:52.000000000 +0400
|
|
+++ src/SFML/Graphics/Makefile 2014-08-18 16:52:41.000000000 +0400
|
|
@@ -16,7 +16,7 @@
|
|
LIBNAME = $(LIBPATH)/$(LIB)
|
|
INSTALL =
|
|
else
|
|
- LIB = libsfml-graphics.so
|
|
+ LIB = libsfml1-graphics.so
|
|
LIBNAME = $(LIBPATH)/$(LIB).$(VERSION)
|
|
INSTALL = && $(LN) $(LNFLAGS) $(LIB).$(VERSION) $(DESTLIBDIR)/$(LIB)
|
|
endif
|
|
@@ -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
|
|
+libsfml1-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 $< $(CXXFLAGS) -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
|
|
|