Now using stb_image directly for loading image files, instead of SOIL (which is not maintained anymore)

git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1542 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
LaurentGom 2010-07-31 14:06:30 +00:00
parent 42173d6d04
commit ff367bdb57
14 changed files with 5502 additions and 311 deletions

View file

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_workspace_file>
<Workspace title="SFML workspace">
<Project filename="sfml-system.cbp" active="1" />
<Project filename="sfml-system.cbp" />
<Project filename="sfml-window.cbp" />
<Project filename="sfml-network.cbp" />
<Project filename="sfml-graphics.cbp" />
<Project filename="sfml-graphics.cbp" active="1" />
<Project filename="sfml-audio.cbp" />
<Project filename="sfml-main.cbp" />
<Project filename="..\..\samples\build\codeblocks\ftp.cbp" />

View file

@ -63,8 +63,6 @@ echo Adding external libraries to libsfml-graphics-s...
ar x %SFML%\extlibs\libs-mingw\libfreetype.a
ar x %SFML%\extlibs\libs-mingw\libglew.a
ar x %SFML%\extlibs\libs-mingw\libjpeg.a
ar x %SFML%\extlibs\libs-mingw\libpng.a
ar x %SFML%\extlibs\libs-mingw\libsoil.a
ar rs libsfml-graphics-s.a *.o
ar rs libsfml-graphics-s-d.a *.o
del *.o /f /q

View file

@ -33,8 +33,6 @@
<Add library="..\..\extlibs\libs-mingw\libfreetype.a" />
<Add library="..\..\extlibs\libs-mingw\libglew.a" />
<Add library="..\..\extlibs\libs-mingw\libjpeg.a" />
<Add library="..\..\extlibs\libs-mingw\libpng.a" />
<Add library="..\..\extlibs\libs-mingw\libsoil.a" />
<Add library="libopengl32.a" />
<Add directory="..\..\extlibs" />
</Linker>
@ -67,8 +65,6 @@
<Add library="..\..\extlibs\libs-mingw\libfreetype.a" />
<Add library="..\..\extlibs\libs-mingw\libglew.a" />
<Add library="..\..\extlibs\libs-mingw\libjpeg.a" />
<Add library="..\..\extlibs\libs-mingw\libpng.a" />
<Add library="..\..\extlibs\libs-mingw\libsoil.a" />
<Add library="libopengl32.a" />
<Add directory="..\..\extlibs" />
</Linker>
@ -124,7 +120,6 @@
<Add directory="..\..\src" />
<Add directory="..\..\include" />
<Add directory="..\..\extlibs\headers" />
<Add directory="..\..\extlibs\headers\png" />
<Add directory="..\..\extlibs\headers\jpeg" />
</Compiler>
<Linker>