summaryrefslogtreecommitdiff
path: root/devel/sfml/files
diff options
context:
space:
mode:
Diffstat (limited to 'devel/sfml/files')
-rw-r--r--devel/sfml/files/patch-src-SFML-Audio-Makefile19
-rw-r--r--devel/sfml/files/patch-src-SFML-Graphics-Makefile21
-rw-r--r--devel/sfml/files/patch-src-SFML-Makefile40
-rw-r--r--devel/sfml/files/patch-src-SFML-Network-Makefile15
-rw-r--r--devel/sfml/files/patch-src-SFML-System-Makefile15
-rw-r--r--devel/sfml/files/patch-src-SFML-Window-Makefile15
6 files changed, 125 insertions, 0 deletions
diff --git a/devel/sfml/files/patch-src-SFML-Audio-Makefile b/devel/sfml/files/patch-src-SFML-Audio-Makefile
new file mode 100644
index 000000000000..f582c5fdcb51
--- /dev/null
+++ b/devel/sfml/files/patch-src-SFML-Audio-Makefile
@@ -0,0 +1,19 @@
+--- src/SFML/Audio/Makefile.orig 2009-05-28 19:57:04.000000000 +0400
++++ src/SFML/Audio/Makefile 2009-07-07 19:51:57.000000000 +0400
+@@ -19,13 +19,13 @@
+ $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJVORBIS)
+
+ libsfml-audio.so: $(OBJ) $(OBJVORBIS)
+- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJVORBIS) -lsndfile -lopenal
++ $(CXX) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJVORBIS) -lsndfile -lopenal
+
+ $(OBJ): %.o: %.cpp
+- $(CPP) -o $@ -c $< $(CFLAGS)
++ $(CXX) -o $@ -c $< $(CXXFLAGS)
+
+ $(OBJVORBIS): %.o: %.c
+- $(CC) -o $@ -c $< $(CFLAGSEXT)
++ $(CC) -o $@ -c $< $(CFLAGS)
+
+ .PHONY: clean mrproper
+
diff --git a/devel/sfml/files/patch-src-SFML-Graphics-Makefile b/devel/sfml/files/patch-src-SFML-Graphics-Makefile
new file mode 100644
index 000000000000..a2ca18f8b615
--- /dev/null
+++ b/devel/sfml/files/patch-src-SFML-Graphics-Makefile
@@ -0,0 +1,21 @@
+--- src/SFML/Graphics/Makefile.orig 2009-05-28 19:57:02.000000000 +0400
++++ src/SFML/Graphics/Makefile 2009-07-07 19:59:29.000000000 +0400
+@@ -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
++libsfml-graphics.so: $(OBJ) $(OBJGLEW) $(OBJSOIL)
++ $(CXX) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJSOIL) -lfreetype -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
++ $(CC) -o $@ -c $< $(CFLAGS) -DSTBI_FAILURE_USERMSG
+
+ .PHONY: clean mrproper
+
diff --git a/devel/sfml/files/patch-src-SFML-Makefile b/devel/sfml/files/patch-src-SFML-Makefile
new file mode 100644
index 000000000000..dcd378ae19e6
--- /dev/null
+++ b/devel/sfml/files/patch-src-SFML-Makefile
@@ -0,0 +1,40 @@
+--- src/SFML/Makefile.orig 2009-05-28 19:57:08.000000000 +0400
++++ src/SFML/Makefile 2009-07-07 20:02:57.000000000 +0400
+@@ -4,7 +4,7 @@
+ ifeq ($(DEBUGBUILD), yes)
+ DEBUGFLAGS = -g -DDEBUG
+ else
+- DEBUGFLAGS = -O2 -DNDEBUG
++ DEBUGFLAGS =
+ endif
+
+ ifeq ($(STATIC), no)
+@@ -15,11 +15,11 @@
+ LINKFLAGS =
+ endif
+
+-export CC = gcc
+-export CPP = g++
+-export CFLAGS = -W -Wall -pedantic -I../../../include -I../../ $(DEBUGFLAGS) $(BUILDFLAGS)
+-export CFLAGSEXT = -I../../../include -I../.. $(DEBUGFLAGS) $(BUILDFLAGS)
+-export LDFLAGS = $(LINKFLAGS)
++export CC ?= gcc
++export CXX ?= g++
++export CFLAGS += -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 -I../../../include -I../.. $(DEBUGFLAGS) $(BUILDFLAGS)
++export CXXFLAGS += -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 -W -Wall -pedantic -I../../../include -I../../ $(DEBUGFLAGS) $(BUILDFLAGS)
++export LDFLAGS = -L${LOCALBASE}/lib $(LINKFLAGS)
+ export LIBPATH = ../../../lib
+ export VERSION = 1.5
+ export CP = cp
+@@ -27,9 +27,9 @@
+ export LNFLAGS = -s -f
+ export AR = ar
+ export ARFLAGS = rcs
+-export DESTDIR = /usr
++export DESTDIR = ${PREFIX}
+ export DESTLIBDIR = $(DESTDIR)/lib
+-export DESTINCDIR = $(DESTDIR)/include
++export DESTINCDIR = $(DESTDIR)/include/SFML
+
+ all: sfml-system sfml-window sfml-network sfml-graphics sfml-audio
+
diff --git a/devel/sfml/files/patch-src-SFML-Network-Makefile b/devel/sfml/files/patch-src-SFML-Network-Makefile
new file mode 100644
index 000000000000..17e30d21b567
--- /dev/null
+++ b/devel/sfml/files/patch-src-SFML-Network-Makefile
@@ -0,0 +1,15 @@
+--- src/SFML/Network/Makefile.orig 2009-05-28 19:57:08.000000000 +0400
++++ src/SFML/Network/Makefile 2009-07-07 20:01:13.000000000 +0400
+@@ -17,10 +17,10 @@
+ $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ)
+
+ libsfml-network.so: $(OBJ)
+- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ)
++ $(CXX) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ)
+
+ $(OBJ): %.o: %.cpp
+- $(CPP) -o $@ -c $< $(CFLAGS)
++ $(CXX) -o $@ -c $< $(CXXFLAGS)
+
+ .PHONY: clean mrproper
+
diff --git a/devel/sfml/files/patch-src-SFML-System-Makefile b/devel/sfml/files/patch-src-SFML-System-Makefile
new file mode 100644
index 000000000000..6f05acbccc1f
--- /dev/null
+++ b/devel/sfml/files/patch-src-SFML-System-Makefile
@@ -0,0 +1,15 @@
+--- src/SFML/System/Makefile.orig 2009-05-28 19:57:04.000000000 +0400
++++ src/SFML/System/Makefile 2009-07-07 19:51:23.000000000 +0400
+@@ -17,10 +17,10 @@
+ $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ)
+
+ libsfml-system.so: $(OBJ)
+- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) -lpthread
++ $(CXX) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) ${PTHREAD_LIBS}
+
+ $(OBJ): %.o: %.cpp
+- $(CPP) -o $@ -c $< $(CFLAGS)
++ $(CXX) -o $@ -c $< $(CXXFLAGS)
+
+ .PHONY: clean mrproper
+
diff --git a/devel/sfml/files/patch-src-SFML-Window-Makefile b/devel/sfml/files/patch-src-SFML-Window-Makefile
new file mode 100644
index 000000000000..f3b76a19cbfb
--- /dev/null
+++ b/devel/sfml/files/patch-src-SFML-Window-Makefile
@@ -0,0 +1,15 @@
+--- src/SFML/Window/Makefile.orig 2009-05-28 19:57:08.000000000 +0400
++++ src/SFML/Window/Makefile 2009-07-07 19:51:46.000000000 +0400
+@@ -18,10 +18,10 @@
+ $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ)
+
+ libsfml-window.so: $(OBJ)
+- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) -lX11 -lXrandr -lGL
++ $(CXX) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) -lX11 -lXrandr -lGL
+
+ $(OBJ): %.o: %.cpp
+- $(CPP) -o $@ -c $< $(CFLAGS)
++ $(CXX) -o $@ -c $< $(CXXFLAGS)
+
+ .PHONY: clean mrproper
+