mirror of
https://gitdl.cn/https://github.com/chakralinux/desktop.git
synced 2025-02-13 20:09:04 +08:00
Removed unneeded patch from SFML.
This commit is contained in:
parent
8ca622f0c2
commit
5892715282
@ -1,70 +0,0 @@
|
|||||||
Only in SFML-1.6-old/lib: libsfml-graphics.so.1.6
|
|
||||||
Binary files SFML-1.6-old/lib/libsfml-network.so.1.6 and SFML-1.6/lib/libsfml-network.so.1.6 differ
|
|
||||||
Binary files SFML-1.6-old/lib/libsfml-system.so.1.6 and SFML-1.6/lib/libsfml-system.so.1.6 differ
|
|
||||||
Binary files SFML-1.6-old/lib/libsfml-window.so.1.6 and SFML-1.6/lib/libsfml-window.so.1.6 differ
|
|
||||||
diff -ur SFML-1.6-old/src/SFML/Graphics/ImageLoader.cpp SFML-1.6/src/SFML/Graphics/ImageLoader.cpp
|
|
||||||
--- SFML-1.6-old/src/SFML/Graphics/ImageLoader.cpp 2010-01-27 15:00:05.000000000 +0100
|
|
||||||
+++ SFML-1.6/src/SFML/Graphics/ImageLoader.cpp 2010-08-16 12:27:33.983627625 +0200
|
|
||||||
@@ -28,10 +28,10 @@
|
|
||||||
#include <SFML/Graphics/ImageLoader.hpp>
|
|
||||||
extern "C"
|
|
||||||
{
|
|
||||||
- #include <SFML/Graphics/libjpeg/jpeglib.h>
|
|
||||||
- #include <SFML/Graphics/libjpeg/jerror.h>
|
|
||||||
+ #include <jpeglib.h>
|
|
||||||
+ #include <jerror.h>
|
|
||||||
}
|
|
||||||
-#include <SFML/Graphics/libpng/png.h>
|
|
||||||
+#include <png.h>
|
|
||||||
#include <SFML/Graphics/SOIL/SOIL.h>
|
|
||||||
#include <iostream>
|
|
||||||
|
|
||||||
Only in SFML-1.6-old/src/SFML/Graphics: ImageLoader.cpp.rej
|
|
||||||
diff -ur SFML-1.6-old/src/SFML/Graphics/Makefile SFML-1.6/src/SFML/Graphics/Makefile
|
|
||||||
--- SFML-1.6-old/src/SFML/Graphics/Makefile 2010-01-27 15:00:05.000000000 +0100
|
|
||||||
+++ SFML-1.6/src/SFML/Graphics/Makefile 2010-08-16 12:25:13.663501212 +0200
|
|
||||||
@@ -1,15 +1,5 @@
|
|
||||||
SRC = $(wildcard *.cpp)
|
|
||||||
-SRCGLEW = $(wildcard ./GLEW/*.c)
|
|
||||||
-SRCJPEG = $(wildcard ./libjpeg/*.c)
|
|
||||||
-SRCPNG = $(wildcard ./libpng/*.c)
|
|
||||||
-SRCSOIL = $(wildcard ./SOIL/*.c)
|
|
||||||
-SRCZLIB = $(wildcard ./zlib/*.c)
|
|
||||||
OBJ = $(SRC:.cpp=.o)
|
|
||||||
-OBJGLEW = $(SRCGLEW:.c=.o)
|
|
||||||
-OBJJPEG = $(SRCJPEG:.c=.o)
|
|
||||||
-OBJPNG = $(SRCPNG:.c=.o)
|
|
||||||
-OBJSOIL = $(SRCSOIL:.c=.o)
|
|
||||||
-OBJZLIB = $(SRCZLIB:.c=.o)
|
|
||||||
|
|
||||||
ifeq ($(STATIC), yes)
|
|
||||||
LIB = libsfml-graphics-s.a
|
|
||||||
@@ -23,22 +13,19 @@
|
|
||||||
|
|
||||||
all: $(LIB)
|
|
||||||
|
|
||||||
-libsfml-graphics-s.a: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
|
|
||||||
- $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
|
|
||||||
+libsfml-graphics-s.a: $(OBJ)
|
|
||||||
+ $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) -static -lGLEW -ljpeg -lpng -lsoil -lz -lSOIL
|
|
||||||
|
|
||||||
-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)
|
|
||||||
+ $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) -lGLEW -ljpeg -lpng -lSOIL -lz -lfreetype -lX11 -lGL
|
|
||||||
|
|
||||||
$(OBJ): %.o: %.cpp
|
|
||||||
$(CPP) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2
|
|
||||||
|
|
||||||
-$(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB): %.o: %.c
|
|
||||||
- $(CC) -o $@ -c $< $(CFLAGSEXT) -DSTBI_FAILURE_USERMSG
|
|
||||||
-
|
|
||||||
.PHONY: clean mrproper
|
|
||||||
|
|
||||||
clean:
|
|
||||||
- @rm -rf $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
|
|
||||||
+ @rm -rf $(OBJ)
|
|
||||||
|
|
||||||
mrproper: clean
|
|
||||||
@rm -rf $(LIBNAME)
|
|
||||||
Only in SFML-1.6-old/src/SFML/Graphics: Makefile.rej
|
|
Loading…
Reference in New Issue
Block a user