[SCM] Simple and fast multimedia library for C++ branch, debian/repacking, updated. 4377fe91f5903c7b883327307788d934afc5e9f8

[Christoph Egger]

The following commit has been merged in the debian/repacking branch:
commit 4377fe91f5903c7b883327307788d934afc5e9f8
Merge: 4bd0d170a15c1381330177bc5e3f7db1b86abbdc d712a7dbf4921bddc1a0b42e36c0a77de269c927
Author: Christoph Egger <Christoph.Egger at gmx.de>
Date:   Sat Jan 10 17:20:25 2009 +0100

    Merge commit 'refs/top-bases/debian/repacking' into debian/repacking

diff --combined src/SFML/Graphics/GraphicsContext.hpp
index fdfdb4b,0a76001..fdfdb4b
mode 100644,100755..100755
--- a/src/SFML/Graphics/GraphicsContext.hpp
+++ b/src/SFML/Graphics/GraphicsContext.hpp
@@@ -30,7 -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 --combined src/SFML/Graphics/ImageLoader.cpp
index 91d4362,b9c6a1b..91d4362
mode 100644,100755..100755
--- a/src/SFML/Graphics/ImageLoader.cpp
+++ b/src/SFML/Graphics/ImageLoader.cpp
@@@ -28,11 -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 <libpng/png.h>
 +#include <SOIL/SOIL.h>
  #include <iostream>
  
  
diff --combined src/SFML/Graphics/Makefile
index 346f568,f149155..346f568
mode 100644,100755..100755
--- a/src/SFML/Graphics/Makefile
+++ b/src/SFML/Graphics/Makefile
@@@ -1,5 -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
@@@ -16,16 -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
  
  .PHONY: clean mrproper
  
  clean:
 -	@rm -rf $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
 +	@rm -rf $(OBJ)
  
  mrproper: clean
  	@rm -rf $(LIBNAME)
diff --combined src/SFML/Window/Linux/WindowImplX11.cpp
index 0650e06,0659089..0650e06
mode 100644,100755..100755
--- a/src/SFML/Window/Linux/WindowImplX11.cpp
+++ b/src/SFML/Window/Linux/WindowImplX11.cpp
@@@ -27,8 -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 --combined src/SFML/Window/Makefile
index e64a742,a05a54b..e64a742
mode 100644,100755..100755
--- a/src/SFML/Window/Makefile
+++ b/src/SFML/Window/Makefile
@@@ -1,5 -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
@@@ -17,7 -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) -lGLEW -lX11 -lXrandr -lGL $(LIBPATH)/libsfml-system.so.$(VERSION)
  
  $(OBJ): %.o: %.cpp
  	$(CPP) -o $@ -c $< $(CFLAGS)

-- 
Simple and fast multimedia library for C++