Fixed compile errors with sfRenderWindow and sfImage in CSFML
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/trunk@1004 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
parent
c3687b4018
commit
f044357031
47 changed files with 398 additions and 391 deletions
|
@ -123,6 +123,7 @@
|
|||
<Unit filename="..\include\SFML\Audio\SoundRecorder.h" />
|
||||
<Unit filename="..\include\SFML\Audio\SoundStatus.h" />
|
||||
<Unit filename="..\include\SFML\Audio\SoundStream.h" />
|
||||
<Unit filename="..\include\SFML\Audio\Types.h" />
|
||||
<Unit filename="..\src\SFML\Audio\Listener.cpp" />
|
||||
<Unit filename="..\src\SFML\Audio\Music.cpp" />
|
||||
<Unit filename="..\src\SFML\Audio\Sound.cpp" />
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
<Option compiler="gcc" />
|
||||
<Build>
|
||||
<Target title="Debug DLL_Win32">
|
||||
<Option output="..\lib\mingw\csfml-graphics-d" prefix_auto="1" extension_auto="1" />
|
||||
<Option output="..\lib\mingw\csfml-graphics-d.dll" prefix_auto="1" extension_auto="1" />
|
||||
<Option object_output="..\Temp\csfml-graphics\Debug DLL_Win32" />
|
||||
<Option type="3" />
|
||||
<Option compiler="gcc" />
|
||||
|
@ -31,7 +31,7 @@
|
|||
</Linker>
|
||||
</Target>
|
||||
<Target title="Release DLL_Win32">
|
||||
<Option output="..\lib\mingw\csfml-graphics" prefix_auto="1" extension_auto="1" />
|
||||
<Option output="..\lib\mingw\csfml-graphics.dll" prefix_auto="1" extension_auto="1" />
|
||||
<Option object_output="..\Temp\csfml-graphics\Release DLL_Win32" />
|
||||
<Option external_deps="..\..\lib\mingw\libcsfml-window.a;..\lib\mingw\libcsfml-system.a;" />
|
||||
<Option type="3" />
|
||||
|
@ -56,7 +56,7 @@
|
|||
</Linker>
|
||||
</Target>
|
||||
<Target title="Debug static_Win32">
|
||||
<Option output="..\lib\mingw\libcsfml-graphics-s-d" prefix_auto="1" extension_auto="1" />
|
||||
<Option output="..\lib\mingw\libcsfml-graphics-s-d.a" prefix_auto="1" extension_auto="1" />
|
||||
<Option working_dir="" />
|
||||
<Option object_output="..\Temp\csfml-graphics\Debug static_Win32" />
|
||||
<Option external_deps="..\..\lib\mingw\libcsfml-window-s-d.a;..\lib\mingw\libcsfml-system-s-d.a;" />
|
||||
|
@ -83,7 +83,7 @@
|
|||
</Linker>
|
||||
</Target>
|
||||
<Target title="Release static_Win32">
|
||||
<Option output="..\lib\mingw\libcsfml-graphics-s" prefix_auto="1" extension_auto="1" />
|
||||
<Option output="..\lib\mingw\libcsfml-graphics-s.a" prefix_auto="1" extension_auto="1" />
|
||||
<Option working_dir="" />
|
||||
<Option object_output="..\Temp\csfml-graphics\Release static_Win32" />
|
||||
<Option external_deps="..\..\lib\mingw\libcsfml-window-s.a;..\lib\mingw\libcsfml-system-s.a;" />
|
||||
|
@ -132,6 +132,7 @@
|
|||
<Unit filename="..\include\SFML\Graphics\Shape.h" />
|
||||
<Unit filename="..\include\SFML\Graphics\Sprite.h" />
|
||||
<Unit filename="..\include\SFML\Graphics\String.h" />
|
||||
<Unit filename="..\include\SFML\Graphics\Types.h" />
|
||||
<Unit filename="..\include\SFML\Graphics\View.h" />
|
||||
<Unit filename="..\src\SFML\Graphics\Color.cpp" />
|
||||
<Unit filename="..\src\SFML\Graphics\Font.cpp" />
|
||||
|
@ -145,7 +146,6 @@
|
|||
<Unit filename="..\src\SFML\Graphics\View.cpp" />
|
||||
<Extensions>
|
||||
<code_completion />
|
||||
<debugger />
|
||||
</Extensions>
|
||||
</Project>
|
||||
</CodeBlocks_project_file>
|
||||
|
|
|
@ -114,6 +114,7 @@
|
|||
<Unit filename="..\include\SFML\Network\SocketStatus.h" />
|
||||
<Unit filename="..\include\SFML\Network\SocketTCP.h" />
|
||||
<Unit filename="..\include\SFML\Network\SocketUDP.h" />
|
||||
<Unit filename="..\include\SFML\Network\Types.h" />
|
||||
<Unit filename="..\src\SFML\Network\Ftp.cpp" />
|
||||
<Unit filename="..\src\SFML\Network\Http.cpp" />
|
||||
<Unit filename="..\src\SFML\Network\IPAddress.cpp" />
|
||||
|
|
|
@ -104,6 +104,7 @@
|
|||
<Unit filename="..\include\SFML\System\Randomizer.h" />
|
||||
<Unit filename="..\include\SFML\System\Sleep.h" />
|
||||
<Unit filename="..\include\SFML\System\Thread.h" />
|
||||
<Unit filename="..\include\SFML\System\Types.h" />
|
||||
<Unit filename="..\src\SFML\System\Clock.cpp" />
|
||||
<Unit filename="..\src\SFML\System\Mutex.cpp" />
|
||||
<Unit filename="..\src\SFML\System\Randomizer.cpp" />
|
||||
|
|
|
@ -1,135 +1,135 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
|
||||
<CodeBlocks_project_file>
|
||||
<FileVersion major="1" minor="6" />
|
||||
<Project>
|
||||
<Option title="csfml-window" />
|
||||
<Option pch_mode="2" />
|
||||
<Option compiler="gcc" />
|
||||
<Build>
|
||||
<Target title="Debug DLL_Win32">
|
||||
<Option output="..\lib\mingw\csfml-window-d" prefix_auto="1" extension_auto="1" />
|
||||
<Option object_output="..\Temp\csfml-window\Debug DLL_Win32" />
|
||||
<Option external_deps="..\..\lib\mingw\csfml-system-d.a;" />
|
||||
<Option type="3" />
|
||||
<Option compiler="gcc" />
|
||||
<Option createStaticLib="1" />
|
||||
<Compiler>
|
||||
<Add option="-Wall" />
|
||||
<Add option="-O0" />
|
||||
<Add option="-DWIN32" />
|
||||
<Add option="-D_DEBUG" />
|
||||
<Add option="-D_LIB" />
|
||||
<Add option="-DCSFML_EXPORTS" />
|
||||
<Add option="-DGLEW_BUILD" />
|
||||
</Compiler>
|
||||
<ResourceCompiler>
|
||||
<Add directory="..\..\src" />
|
||||
</ResourceCompiler>
|
||||
<Linker>
|
||||
<Add option="-lsfml-window-s-d" />
|
||||
<Add option="-lsfml-system-s-d" />
|
||||
</Linker>
|
||||
</Target>
|
||||
<Target title="Release DLL_Win32">
|
||||
<Option output="..\lib\mingw\csfml-window" prefix_auto="1" extension_auto="1" />
|
||||
<Option object_output="..\Temp\csfml-window\Release DLL_Win32" />
|
||||
<Option external_deps="..\..\lib\mingw\csfml-system.a;" />
|
||||
<Option type="3" />
|
||||
<Option compiler="gcc" />
|
||||
<Option createStaticLib="1" />
|
||||
<Compiler>
|
||||
<Add option="-O3" />
|
||||
<Add option="-Wall" />
|
||||
<Add option="-DWIN32" />
|
||||
<Add option="-DNDEBUG" />
|
||||
<Add option="-D_LIB" />
|
||||
<Add option="-DCSFML_EXPORTS" />
|
||||
<Add option="-DGLEW_BUILD" />
|
||||
</Compiler>
|
||||
<ResourceCompiler>
|
||||
<Add directory="..\..\src" />
|
||||
</ResourceCompiler>
|
||||
<Linker>
|
||||
<Add option="-lsfml-window-s" />
|
||||
<Add option="-lsfml-system-s" />
|
||||
</Linker>
|
||||
</Target>
|
||||
<Target title="Debug static_Win32">
|
||||
<Option output="..\lib\mingw\libcsfml-window-s-d" prefix_auto="1" extension_auto="1" />
|
||||
<Option working_dir="" />
|
||||
<Option object_output="..\Temp\csfml-window\Debug static_Win32" />
|
||||
<Option external_deps="..\..\lib\mingw\csfml-system-s-d.a;" />
|
||||
<Option type="2" />
|
||||
<Option compiler="gcc" />
|
||||
<Option createDefFile="1" />
|
||||
<Compiler>
|
||||
<Add option="-Wall" />
|
||||
<Add option="-O0" />
|
||||
<Add option="-DWIN32" />
|
||||
<Add option="-D_DEBUG" />
|
||||
<Add option="-D_LIB" />
|
||||
<Add option="-DCSFML_EXPORTS" />
|
||||
<Add option="-DGLEW_STATIC" />
|
||||
</Compiler>
|
||||
<ResourceCompiler>
|
||||
<Add directory="..\..\src" />
|
||||
</ResourceCompiler>
|
||||
<Linker>
|
||||
<Add option="-lsfml-window-s-d" />
|
||||
<Add option="-lsfml-system-s-d" />
|
||||
</Linker>
|
||||
</Target>
|
||||
<Target title="Release static_Win32">
|
||||
<Option output="..\lib\mingw\libcsfml-window-s" prefix_auto="1" extension_auto="1" />
|
||||
<Option working_dir="" />
|
||||
<Option object_output="..\Temp\csfml-window\Release static_Win32" />
|
||||
<Option external_deps="..\..\lib\mingw\csfml-system-s.a;" />
|
||||
<Option type="2" />
|
||||
<Option compiler="gcc" />
|
||||
<Option createDefFile="1" />
|
||||
<Compiler>
|
||||
<Add option="-O3" />
|
||||
<Add option="-Wall" />
|
||||
<Add option="-DWIN32" />
|
||||
<Add option="-DNDEBUG" />
|
||||
<Add option="-D_LIB" />
|
||||
<Add option="-DCSFML_EXPORTS" />
|
||||
<Add option="-DGLEW_STATIC" />
|
||||
</Compiler>
|
||||
<ResourceCompiler>
|
||||
<Add directory="..\..\src" />
|
||||
</ResourceCompiler>
|
||||
<Linker>
|
||||
<Add option="-lsfml-window-s" />
|
||||
<Add option="-lsfml-system-s" />
|
||||
</Linker>
|
||||
</Target>
|
||||
</Build>
|
||||
<Compiler>
|
||||
<Add directory="..\src" />
|
||||
<Add directory="..\include" />
|
||||
<Add directory="..\..\include" />
|
||||
</Compiler>
|
||||
<Linker>
|
||||
<Add option="--verbose" />
|
||||
<Add library="libwinmm.a" />
|
||||
<Add library="libopengl32.a" />
|
||||
<Add library="libgdi32.a" />
|
||||
<Add directory="..\..\lib\mingw" />
|
||||
</Linker>
|
||||
<Unit filename="..\include\SFML\Window\Context.h" />
|
||||
<Unit filename="..\include\SFML\Window\Event.h" />
|
||||
<Unit filename="..\include\SFML\Window\Input.h" />
|
||||
<Unit filename="..\include\SFML\Window\VideoMode.h" />
|
||||
<Unit filename="..\include\SFML\Window\Window.h" />
|
||||
<Unit filename="..\include\SFML\Window\WindowHandle.h" />
|
||||
<Unit filename="..\src\SFML\Window\Context.cpp" />
|
||||
<Unit filename="..\src\SFML\Window\Input.cpp" />
|
||||
<Unit filename="..\src\SFML\Window\VideoMode.cpp" />
|
||||
<Unit filename="..\src\SFML\Window\Window.cpp" />
|
||||
<Extensions>
|
||||
<code_completion />
|
||||
<debugger />
|
||||
</Extensions>
|
||||
</Project>
|
||||
</CodeBlocks_project_file>
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
|
||||
<CodeBlocks_project_file>
|
||||
<FileVersion major="1" minor="6" />
|
||||
<Project>
|
||||
<Option title="csfml-window" />
|
||||
<Option pch_mode="2" />
|
||||
<Option compiler="gcc" />
|
||||
<Build>
|
||||
<Target title="Debug DLL_Win32">
|
||||
<Option output="..\lib\mingw\csfml-window-d.dll" prefix_auto="1" extension_auto="1" />
|
||||
<Option object_output="..\Temp\csfml-window\Debug DLL_Win32" />
|
||||
<Option external_deps="..\..\lib\mingw\csfml-system-d.a;" />
|
||||
<Option type="3" />
|
||||
<Option compiler="gcc" />
|
||||
<Option createStaticLib="1" />
|
||||
<Compiler>
|
||||
<Add option="-Wall" />
|
||||
<Add option="-O0" />
|
||||
<Add option="-DWIN32" />
|
||||
<Add option="-D_DEBUG" />
|
||||
<Add option="-D_LIB" />
|
||||
<Add option="-DCSFML_EXPORTS" />
|
||||
<Add option="-DGLEW_BUILD" />
|
||||
</Compiler>
|
||||
<ResourceCompiler>
|
||||
<Add directory="..\..\src" />
|
||||
</ResourceCompiler>
|
||||
<Linker>
|
||||
<Add option="-lsfml-window-s-d" />
|
||||
<Add option="-lsfml-system-s-d" />
|
||||
</Linker>
|
||||
</Target>
|
||||
<Target title="Release DLL_Win32">
|
||||
<Option output="..\lib\mingw\csfml-window.dll" prefix_auto="1" extension_auto="1" />
|
||||
<Option object_output="..\Temp\csfml-window\Release DLL_Win32" />
|
||||
<Option external_deps="..\..\lib\mingw\csfml-system.a;" />
|
||||
<Option type="3" />
|
||||
<Option compiler="gcc" />
|
||||
<Option createStaticLib="1" />
|
||||
<Compiler>
|
||||
<Add option="-O3" />
|
||||
<Add option="-Wall" />
|
||||
<Add option="-DWIN32" />
|
||||
<Add option="-DNDEBUG" />
|
||||
<Add option="-D_LIB" />
|
||||
<Add option="-DCSFML_EXPORTS" />
|
||||
<Add option="-DGLEW_BUILD" />
|
||||
</Compiler>
|
||||
<ResourceCompiler>
|
||||
<Add directory="..\..\src" />
|
||||
</ResourceCompiler>
|
||||
<Linker>
|
||||
<Add option="-lsfml-window-s" />
|
||||
<Add option="-lsfml-system-s" />
|
||||
</Linker>
|
||||
</Target>
|
||||
<Target title="Debug static_Win32">
|
||||
<Option output="..\lib\mingw\libcsfml-window-s-d.a" prefix_auto="1" extension_auto="1" />
|
||||
<Option working_dir="" />
|
||||
<Option object_output="..\Temp\csfml-window\Debug static_Win32" />
|
||||
<Option external_deps="..\..\lib\mingw\csfml-system-s-d.a;" />
|
||||
<Option type="2" />
|
||||
<Option compiler="gcc" />
|
||||
<Option createDefFile="1" />
|
||||
<Compiler>
|
||||
<Add option="-Wall" />
|
||||
<Add option="-O0" />
|
||||
<Add option="-DWIN32" />
|
||||
<Add option="-D_DEBUG" />
|
||||
<Add option="-D_LIB" />
|
||||
<Add option="-DCSFML_EXPORTS" />
|
||||
<Add option="-DGLEW_STATIC" />
|
||||
</Compiler>
|
||||
<ResourceCompiler>
|
||||
<Add directory="..\..\src" />
|
||||
</ResourceCompiler>
|
||||
<Linker>
|
||||
<Add option="-lsfml-window-s-d" />
|
||||
<Add option="-lsfml-system-s-d" />
|
||||
</Linker>
|
||||
</Target>
|
||||
<Target title="Release static_Win32">
|
||||
<Option output="..\lib\mingw\libcsfml-window-s.a" prefix_auto="1" extension_auto="1" />
|
||||
<Option working_dir="" />
|
||||
<Option object_output="..\Temp\csfml-window\Release static_Win32" />
|
||||
<Option external_deps="..\..\lib\mingw\csfml-system-s.a;" />
|
||||
<Option type="2" />
|
||||
<Option compiler="gcc" />
|
||||
<Option createDefFile="1" />
|
||||
<Compiler>
|
||||
<Add option="-O3" />
|
||||
<Add option="-Wall" />
|
||||
<Add option="-DWIN32" />
|
||||
<Add option="-DNDEBUG" />
|
||||
<Add option="-D_LIB" />
|
||||
<Add option="-DCSFML_EXPORTS" />
|
||||
<Add option="-DGLEW_STATIC" />
|
||||
</Compiler>
|
||||
<ResourceCompiler>
|
||||
<Add directory="..\..\src" />
|
||||
</ResourceCompiler>
|
||||
<Linker>
|
||||
<Add option="-lsfml-window-s" />
|
||||
<Add option="-lsfml-system-s" />
|
||||
</Linker>
|
||||
</Target>
|
||||
</Build>
|
||||
<Compiler>
|
||||
<Add directory="..\src" />
|
||||
<Add directory="..\include" />
|
||||
<Add directory="..\..\include" />
|
||||
</Compiler>
|
||||
<Linker>
|
||||
<Add option="--verbose" />
|
||||
<Add library="libwinmm.a" />
|
||||
<Add library="libopengl32.a" />
|
||||
<Add library="libgdi32.a" />
|
||||
<Add directory="..\..\lib\mingw" />
|
||||
</Linker>
|
||||
<Unit filename="..\include\SFML\Window\Context.h" />
|
||||
<Unit filename="..\include\SFML\Window\Event.h" />
|
||||
<Unit filename="..\include\SFML\Window\Input.h" />
|
||||
<Unit filename="..\include\SFML\Window\Types.h" />
|
||||
<Unit filename="..\include\SFML\Window\VideoMode.h" />
|
||||
<Unit filename="..\include\SFML\Window\Window.h" />
|
||||
<Unit filename="..\include\SFML\Window\WindowHandle.h" />
|
||||
<Unit filename="..\src\SFML\Window\Context.cpp" />
|
||||
<Unit filename="..\src\SFML\Window\Input.cpp" />
|
||||
<Unit filename="..\src\SFML\Window\VideoMode.cpp" />
|
||||
<Unit filename="..\src\SFML\Window\Window.cpp" />
|
||||
<Extensions>
|
||||
<code_completion />
|
||||
</Extensions>
|
||||
</Project>
|
||||
</CodeBlocks_project_file>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue