Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (4aa0e7ff9e13721d77458636b89aa1c186c308d8)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (4aa0e7ff9e13721d77458636b89aa1c186c308d8)
  • Date: Sat, 10 Jan 2015 19:40:22 -0600

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

graphics-libs/sfml/BUILD | 2
graphics-libs/sfml/DETAILS | 10 +-
graphics-libs/sfml/HISTORY | 9 ++
graphics-libs/sfml/PRE_BUILD | 8 --
graphics-libs/sfml/fix-includes.diff | 23 ------
graphics-libs/sfml/gcc-4.6.diff | 132
-----------------------------------
graphics-libs/sfml/interlinking.diff | 78 --------------------
graphics-libs/sfml/repacking.diff | 132
-----------------------------------
8 files changed, 15 insertions(+), 379 deletions(-)

New commits:
commit 4aa0e7ff9e13721d77458636b89aa1c186c308d8
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

sfml 2.2

diff --git a/graphics-libs/sfml/BUILD b/graphics-libs/sfml/BUILD
index 6dfecc1..e013b8d 100755
--- a/graphics-libs/sfml/BUILD
+++ b/graphics-libs/sfml/BUILD
@@ -1 +1 @@
-default_build_make
+cmake_build
diff --git a/graphics-libs/sfml/DETAILS b/graphics-libs/sfml/DETAILS
index b53f6c6..44ad515 100755
--- a/graphics-libs/sfml/DETAILS
+++ b/graphics-libs/sfml/DETAILS
@@ -1,9 +1,9 @@
SPELL=sfml
- VERSION=1.6
- SOURCE="SFML-${VERSION}-sdk-linux-32.tar.gz"
-
SOURCE_URL[0]=$SOURCEFORGE_URL/project/${SPELL}/${SPELL}/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:518121bf05ab8b1f4ad917eaca72951ff870e992f79e2b3da94baad762e7de63ce331cf4cade172e285015fb6fec501e25039c633be2f7b77d77b171dc29cb0a
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/SFML-${VERSION}"
+ VERSION=2.2
+ SOURCE="SFML-$VERSION-sources.zip"
+ SOURCE_URL[0]=http://www.sfml-dev.org/files/$SOURCE
+
SOURCE_HASH=sha512:bb90d603505e2d8e461c2fad2b59473d2a296de6155e271f1eeebdcf6dffa319bc7ce4d519bb0893c3bb07b814483450792092939c1d760a4a4d0a08325f57b2
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/SFML-$VERSION"
WEB_SITE="http://www.sfml-dev.org";
LICENSE[0]=BSD
ENTERED=20111225
diff --git a/graphics-libs/sfml/HISTORY b/graphics-libs/sfml/HISTORY
index d8ff5f1..99a8304 100644
--- a/graphics-libs/sfml/HISTORY
+++ b/graphics-libs/sfml/HISTORY
@@ -1,3 +1,12 @@
+2015-01-10 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD: 2.2 builds with CMake
+ * DETAILS: updated spell to 2.2
+ * PRE_BUILD: removed, no longer needed
+ * fix-includes.diff: removed, no longer needed
+ * gcc-4.6.diff: removed, no longer needed
+ * interlinking.diff: removed, no longer needed
+ * repacking.diff: removed, no longer needed
+
2011-12-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD, DEPENDS, DETAILS, PRE_BUILD: spell created
* added patches from Ubuntu:
diff --git a/graphics-libs/sfml/PRE_BUILD b/graphics-libs/sfml/PRE_BUILD
deleted file mode 100755
index 55aecca..0000000
--- a/graphics-libs/sfml/PRE_BUILD
+++ /dev/null
@@ -1,8 +0,0 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-patch -p1 < ${SCRIPT_DIRECTORY}/fix-includes.diff &&
-patch -p1 < ${SCRIPT_DIRECTORY}/gcc-4.6.diff &&
-patch -p1 < ${SCRIPT_DIRECTORY}/interlinking.diff &&
-patch -p1 < ${SCRIPT_DIRECTORY}/repacking.diff &&
-sedit "s:export *DESTDIR *= */usr/local:export DESTDIR=${INSTALL_ROOT}/usr:"
${SOURCE_DIRECTORY}/src/SFML/Makefile &&
-make mrproper
diff --git a/graphics-libs/sfml/fix-includes.diff
b/graphics-libs/sfml/fix-includes.diff
deleted file mode 100644
index 32d9ab8..0000000
--- a/graphics-libs/sfml/fix-includes.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Christoph Egger <christoph AT debian.org>
-Subject: [PATCH] debian/fix-includes
-
-SFML needs sme modified includes to build against gcc-4.6
-
-Signed-off-by: Christoph Egger <christoph AT debian.org>
-
----
- include/SFML/System/ResourcePtr.inl | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-Index: libsfml-1.6+dfsg1/include/SFML/System/Resource.hpp
-===================================================================
---- libsfml-1.6+dfsg1.orig/include/SFML/System/Resource.hpp 2011-09-21
15:03:16.449574957 +0000
-+++ libsfml-1.6+dfsg1/include/SFML/System/Resource.hpp 2011-09-21
15:03:34.429601847 +0000
-@@ -29,6 +29,7 @@
- // Headers
- ////////////////////////////////////////////////////////////
- #include <set>
-+#include <cstddef>
-
-
- namespace sf
diff --git a/graphics-libs/sfml/gcc-4.6.diff b/graphics-libs/sfml/gcc-4.6.diff
deleted file mode 100644
index 82c2e06..0000000
--- a/graphics-libs/sfml/gcc-4.6.diff
+++ /dev/null
@@ -1,132 +0,0 @@
-From: Evgeni Golov <evgeni AT debian.org>
-Subject: [PATCH] debian/gcc-4.6
-
-Properly link with GCC 4.6.
-#include <cstddef> everywhere.
-Closes: #625031
-
-Signed-off-by: Evgeni Golov <evgeni AT debian.org>
-
----
- include/SFML/Audio/Music.hpp | 1 +
- include/SFML/Audio/Sound.hpp | 1 +
- include/SFML/Audio/SoundBuffer.hpp | 1 +
- include/SFML/Graphics/PostFX.hpp | 1 +
- include/SFML/Graphics/RenderWindow.hpp | 1 +
- include/SFML/Graphics/Sprite.hpp | 1 +
- include/SFML/Graphics/String.hpp | 1 +
- include/SFML/System/ResourcePtr.inl | 1 +
- src/SFML/Graphics/Font.cpp | 1 +
- src/SFML/Graphics/Image.cpp | 1 +
- 10 files changed, 10 insertions(+), 0 deletions(-)
-
-diff --git a/include/SFML/Audio/Music.hpp b/include/SFML/Audio/Music.hpp
-index 0b8f70d..3320676 100755
---- a/include/SFML/Audio/Music.hpp
-+++ b/include/SFML/Audio/Music.hpp
-@@ -28,6 +28,7 @@
- ////////////////////////////////////////////////////////////
- // Headers
- ////////////////////////////////////////////////////////////
-+#include <cstddef>
- #include <SFML/Audio/SoundStream.hpp>
- #include <string>
- #include <vector>
-diff --git a/include/SFML/Audio/Sound.hpp b/include/SFML/Audio/Sound.hpp
-index 7cb8002..5a46481 100755
---- a/include/SFML/Audio/Sound.hpp
-+++ b/include/SFML/Audio/Sound.hpp
-@@ -28,6 +28,7 @@
- ////////////////////////////////////////////////////////////
- // Headers
- ////////////////////////////////////////////////////////////
-+#include <cstddef>
- #include <SFML/System/Resource.hpp>
- #include <SFML/System/Vector3.hpp>
- #include <SFML/Audio/AudioResource.hpp>
-diff --git a/include/SFML/Audio/SoundBuffer.hpp
b/include/SFML/Audio/SoundBuffer.hpp
-index 023e5aa..2db29ad 100755
---- a/include/SFML/Audio/SoundBuffer.hpp
-+++ b/include/SFML/Audio/SoundBuffer.hpp
-@@ -28,6 +28,7 @@
- ////////////////////////////////////////////////////////////
- // Headers
- ////////////////////////////////////////////////////////////
-+#include <cstddef>
- #include <SFML/System/Resource.hpp>
- #include <SFML/Audio/AudioResource.hpp>
- #include <string>
-diff --git a/include/SFML/Graphics/PostFX.hpp
b/include/SFML/Graphics/PostFX.hpp
-index c875377..be2200a 100755
---- a/include/SFML/Graphics/PostFX.hpp
-+++ b/include/SFML/Graphics/PostFX.hpp
-@@ -28,6 +28,7 @@
- ////////////////////////////////////////////////////////////
- // Headers
- ////////////////////////////////////////////////////////////
-+#include <cstddef>
- #include <SFML/Graphics/Drawable.hpp>
- #include <SFML/Graphics/Image.hpp>
- #include <istream>
-diff --git a/include/SFML/Graphics/RenderWindow.hpp
b/include/SFML/Graphics/RenderWindow.hpp
-index 088e368..b2154cc 100755
---- a/include/SFML/Graphics/RenderWindow.hpp
-+++ b/include/SFML/Graphics/RenderWindow.hpp
-@@ -28,6 +28,7 @@
- ////////////////////////////////////////////////////////////
- // Headers
- ////////////////////////////////////////////////////////////
-+#include <cstddef>
- #include <SFML/Graphics/Image.hpp>
- #include <SFML/Graphics/RenderTarget.hpp>
- #include <SFML/Window/Window.hpp>
-diff --git a/include/SFML/Graphics/Sprite.hpp
b/include/SFML/Graphics/Sprite.hpp
-index 9d47bb4..deb6bab 100755
---- a/include/SFML/Graphics/Sprite.hpp
-+++ b/include/SFML/Graphics/Sprite.hpp
-@@ -28,6 +28,7 @@
- ////////////////////////////////////////////////////////////
- // Headers
- ////////////////////////////////////////////////////////////
-+#include <cstddef>
- #include <SFML/System/Resource.hpp>
- #include <SFML/Graphics/Drawable.hpp>
- #include <SFML/Graphics/Rect.hpp>
-diff --git a/include/SFML/Graphics/String.hpp
b/include/SFML/Graphics/String.hpp
-index b0ca81b..6b9c483 100755
---- a/include/SFML/Graphics/String.hpp
-+++ b/include/SFML/Graphics/String.hpp
-@@ -28,6 +28,7 @@
- ////////////////////////////////////////////////////////////
- // Headers
- ////////////////////////////////////////////////////////////
-+#include <cstddef>
- #include <SFML/System/Resource.hpp>
- #include <SFML/System/Unicode.hpp>
- #include <SFML/Graphics/Drawable.hpp>
-diff --git a/src/SFML/Graphics/Font.cpp b/src/SFML/Graphics/Font.cpp
-index 36c4c28..350c0cc 100755
---- a/src/SFML/Graphics/Font.cpp
-+++ b/src/SFML/Graphics/Font.cpp
-@@ -25,6 +25,7 @@
- ////////////////////////////////////////////////////////////
- // Headers
- ////////////////////////////////////////////////////////////
-+#include <cstddef>
- #include <SFML/Graphics/Font.hpp>
- #include <SFML/Graphics/FontLoader.hpp>
- #include <iostream>
-diff --git a/src/SFML/Graphics/Image.cpp b/src/SFML/Graphics/Image.cpp
-index 14346fb..8b18fb7 100755
---- a/src/SFML/Graphics/Image.cpp
-+++ b/src/SFML/Graphics/Image.cpp
-@@ -25,6 +25,7 @@
- ////////////////////////////////////////////////////////////
- // Headers
- ////////////////////////////////////////////////////////////
-+#include <cstddef>
- #include <SFML/Graphics/Image.hpp>
- #include <SFML/Graphics/ImageLoader.hpp>
- #include <SFML/Graphics/RenderWindow.hpp>
---
-tg: (3794d17..) debian/gcc-4.6 (depends on: master)
diff --git a/graphics-libs/sfml/interlinking.diff
b/graphics-libs/sfml/interlinking.diff
deleted file mode 100644
index ce79671..0000000
--- a/graphics-libs/sfml/interlinking.diff
+++ /dev/null
@@ -1,78 +0,0 @@
-From: Christoph Egger <Christoph.Egger AT gmx.de>
-Subject: [PATCH] debian/interlinking
-
- Some of the SFML libraries depend on each other but they are currently not
-linked against them. This patch fixes this issue.
-
-Signed-off-by: Christoph Egger <Christoph.Egger AT gmx.de>
-
----
- src/SFML/Audio/Makefile | 2 +-
- src/SFML/Graphics/Makefile | 2 +-
- src/SFML/Makefile | 4 ++--
- src/SFML/Window/Makefile | 2 +-
- 4 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/SFML/Audio/Makefile b/src/SFML/Audio/Makefile
-index 0215e80..175bb61 100755
---- a/src/SFML/Audio/Makefile
-+++ b/src/SFML/Audio/Makefile
-@@ -19,7 +19,7 @@ libsfml-audio-s.a: $(OBJ) $(OBJVORBIS)
- $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJVORBIS)
-
- libsfml-audio.so: $(OBJ) $(OBJVORBIS)
-- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ)
$(OBJVORBIS) -lsndfile -lopenal
-+ $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ)
$(OBJVORBIS) -lsndfile -lopenal $(LIBPATH)/libsfml-system.so.$(VERSION)
-
- $(OBJ): %.o: %.cpp
- $(CPP) -o $@ -c $< $(CFLAGS)
-diff --git a/src/SFML/Graphics/Makefile b/src/SFML/Graphics/Makefile
-index 4de224d..f149155 100755
---- a/src/SFML/Graphics/Makefile
-+++ b/src/SFML/Graphics/Makefile
-@@ -27,7 +27,7 @@ libsfml-graphics-s.a: $(OBJ) $(OBJGLEW) $(OBJJPEG)
$(OBJPNG) $(OBJSOIL) $(OBJZLI
- $(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
-+ $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ)
$(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) -lfreetype
$(LIBPATH)/libsfml-system.so.$(VERSION)
$(LIBPATH)/libsfml-window.so.$(VERSION) -lGL
-
- $(OBJ): %.o: %.cpp
- $(CPP) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2
-diff --git a/src/SFML/Makefile b/src/SFML/Makefile
-index d8f633e..cd73816 100755
---- a/src/SFML/Makefile
-+++ b/src/SFML/Makefile
-@@ -37,7 +37,7 @@ sfml-system:
- @(mkdir -p ../../lib)
- @(cd ./System && $(MAKE))
-
--sfml-window:
-+sfml-window: sfml-system
- @(mkdir -p ../../lib)
- @(cd ./Window && $(MAKE))
-
-@@ -45,7 +45,7 @@ sfml-network:
- @(mkdir -p ../../lib)
- @(cd ./Network && $(MAKE))
-
--sfml-graphics:
-+sfml-graphics: sfml-system sfml-window
- @(mkdir -p ../../lib)
- @(cd ./Graphics && $(MAKE))
-
-diff --git a/src/SFML/Window/Makefile b/src/SFML/Window/Makefile
-index 0dd689c..a05a54b 100755
---- a/src/SFML/Window/Makefile
-+++ b/src/SFML/Window/Makefile
-@@ -18,7 +18,7 @@ libsfml-window-s.a: $(OBJ)
- $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ)
-
- libsfml-window.so: $(OBJ)
-- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ)
$(OBJGLEW) -lX11 -lXrandr -lGL
-+ $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ)
$(OBJGLEW) -lX11 -lXrandr -lGL $(LIBPATH)/libsfml-system.so.$(VERSION)
-
- $(OBJ): %.o: %.cpp
- $(CPP) -o $@ -c $< $(CFLAGS)
---
-tg: (2bed856..) debian/interlinking (depends on:
debian/destdir-install-symlinks)
diff --git a/graphics-libs/sfml/repacking.diff
b/graphics-libs/sfml/repacking.diff
deleted file mode 100644
index 06d27d1..0000000
--- a/graphics-libs/sfml/repacking.diff
+++ /dev/null
@@ -1,132 +0,0 @@
-From: Christoph Egger <Christoph.Egger AT gmx.de>
-Subject: [PATCH] debian/repacking
-
- SFML Upstream Tarball ships loads of convenience copies in it's tarball and
-builds them inseparable in it's Makefiles.
-
- This patch removes the convenience-copies from all Makefiles and corrects
the
-source-file to use the generic, system-wide libraries.
-
-Signed-off-by: Christoph Egger <Christoph.Egger AT gmx.de>
-
----
- src/SFML/Graphics/GraphicsContext.hpp | 2 +-
- src/SFML/Graphics/ImageLoader.cpp | 8 ++++----
- src/SFML/Graphics/Makefile | 19 +++----------------
- src/SFML/Window/Linux/WindowImplX11.cpp | 4 ++--
- src/SFML/Window/Makefile | 3 +--
- 5 files changed, 11 insertions(+), 25 deletions(-)
-
-diff --git a/src/SFML/Graphics/GraphicsContext.hpp
b/src/SFML/Graphics/GraphicsContext.hpp
-index 2fa77a3..aebfe1f 100755
---- a/src/SFML/Graphics/GraphicsContext.hpp
-+++ b/src/SFML/Graphics/GraphicsContext.hpp
-@@ -30,7 +30,7 @@
- ////////////////////////////////////////////////////////////
- #include <SFML/Config.hpp>
- #include <SFML/System/NonCopyable.hpp>
--#include <SFML/Graphics/GLEW/glew.h>
-+#include <GL/glew.h>
- #include <iostream>
- #include <string>
-
-diff --git a/src/SFML/Graphics/ImageLoader.cpp
b/src/SFML/Graphics/ImageLoader.cpp
-index a3f83bf..e6ceacd 100755
---- a/src/SFML/Graphics/ImageLoader.cpp
-+++ b/src/SFML/Graphics/ImageLoader.cpp
-@@ -28,11 +28,11 @@
- #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 <SFML/Graphics/SOIL/SOIL.h>
-+#include <png.h>
-+#include <SOIL/SOIL.h>
- #include <iostream>
-
-
-diff --git a/src/SFML/Graphics/Makefile b/src/SFML/Graphics/Makefile
-index f149155..346f568 100755
---- a/src/SFML/Graphics/Makefile
-+++ b/src/SFML/Graphics/Makefile
-@@ -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
-@@ -26,19 +16,16 @@ 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
$(LIBPATH)/libsfml-system.so.$(VERSION)
$(LIBPATH)/libsfml-window.so.$(VERSION) -lGL
-+libsfml-graphics.so: $(OBJ)
-+ $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ)
-lGLEW -ljpeg -lpng -lSOIL -lfreetype $(LIBPATH)/libsfml-system.so.$(VERSION)
$(LIBPATH)/libsfml-window.so.$(VERSION) -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)
-diff --git a/src/SFML/Window/Linux/WindowImplX11.cpp
b/src/SFML/Window/Linux/WindowImplX11.cpp
-index edec19b..f527864 100755
---- a/src/SFML/Window/Linux/WindowImplX11.cpp
-+++ b/src/SFML/Window/Linux/WindowImplX11.cpp
-@@ -27,8 +27,8 @@
- ////////////////////////////////////////////////////////////
- #include <SFML/Window/WindowStyle.hpp> // important to be included first
(conflict with None)
- #include <SFML/Window/Linux/WindowImplX11.hpp>
--#include <SFML/Window/glext/glxext.h>
--#include <SFML/Window/glext/glext.h>
-+#include <GL/glxext.h>
-+#include <GL/glext.h>
- #include <SFML/System/Unicode.hpp>
- #include <X11/keysym.h>
- #include <X11/extensions/Xrandr.h>
-diff --git a/src/SFML/Window/Makefile b/src/SFML/Window/Makefile
-index a05a54b..5f9708e 100755
---- a/src/SFML/Window/Makefile
-+++ b/src/SFML/Window/Makefile
-@@ -1,6 +1,5 @@
- SRC = $(wildcard *.cpp ./Linux/*.cpp)
- OBJ = $(SRC:.cpp=.o)
--OBJGLEW = $(SRCGLEW:.c=.o)
-
- ifeq ($(STATIC), yes)
- LIB = libsfml-window-s.a
-@@ -18,7 +17,7 @@ libsfml-window-s.a: $(OBJ)
- $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ)
-
- libsfml-window.so: $(OBJ)
-- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ)
$(OBJGLEW) -lX11 -lXrandr -lGL $(LIBPATH)/libsfml-system.so.$(VERSION)
-+ $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ)
-lX11 -lXrandr -lGL $(LIBPATH)/libsfml-system.so.$(VERSION)
-
- $(OBJ): %.o: %.cpp
- $(CPP) -o $@ -c $< $(CFLAGS)
---
-tg: (cced581..) debian/repacking (depends on: debian/interlinking)



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (4aa0e7ff9e13721d77458636b89aa1c186c308d8), Ismael Luceno, 01/10/2015

Archive powered by MHonArc 2.6.24.

Top of Page