File sfml-1.6-system_libs.patch of Package sfml

Overview Repositories Revisions Requests Users Attributes Meta

File sfml-1.6-system_libs.patch of Package sfml (Revision 32315866ca535d6976ecdd178477cb5e)

Currently displaying revision 32315866ca535d6976ecdd178477cb5e , Show latest

Index: src/SFML/Graphics/GraphicsContext.hpp
===================================================================
--- src/SFML/Graphics/GraphicsContext.hpp.orig
+++ 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>
 
Index: src/SFML/Window/Linux/WindowImplX11.cpp
===================================================================
--- src/SFML/Window/Linux/WindowImplX11.cpp.orig
+++ 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>
Index: src/SFML/Graphics/ImageLoader.cpp
===================================================================
--- src/SFML/Graphics/ImageLoader.cpp.orig
+++ 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>
 
 
Index: src/SFML/Graphics/Makefile
===================================================================
--- src/SFML/Graphics/Makefile.orig
+++ src/SFML/Graphics/Makefile
@@ -27,7 +27,7 @@ libsfml-graphics-s.a: $(OBJ) $(OBJGLEW)
 	$(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 -lX11 -lGL -lpng -ljpeg -lGLEW -lSOIL
 
 $(OBJ): %.o: %.cpp
 	$(CPP) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2

Places

File sfml-1.6-system_libs.patch of Package sfml (Revision 32315866ca535d6976ecdd178477cb5e)

Places