I forgot to update the VS2005 and Code::Blocks projects in last commit :)

git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1418 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
LaurentGom 2010-02-22 15:43:15 +00:00
parent 76de05af61
commit d1ba056b0f
4 changed files with 13 additions and 3 deletions

View File

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

View File

@ -90,6 +90,7 @@
<Add directory="..\..\include" /> <Add directory="..\..\include" />
</Compiler> </Compiler>
<Unit filename="..\..\include\SFML\System\Clock.hpp" /> <Unit filename="..\..\include\SFML\System\Clock.hpp" />
<Unit filename="..\..\include\SFML\System\Err.hpp" />
<Unit filename="..\..\include\SFML\System\Lock.hpp" /> <Unit filename="..\..\include\SFML\System\Lock.hpp" />
<Unit filename="..\..\include\SFML\System\Mutex.hpp" /> <Unit filename="..\..\include\SFML\System\Mutex.hpp" />
<Unit filename="..\..\include\SFML\System\NonCopyable.hpp" /> <Unit filename="..\..\include\SFML\System\NonCopyable.hpp" />
@ -110,6 +111,7 @@
<Unit filename="..\..\include\SFML\System\Vector3.hpp" /> <Unit filename="..\..\include\SFML\System\Vector3.hpp" />
<Unit filename="..\..\include\SFML\System\Vector3.inl" /> <Unit filename="..\..\include\SFML\System\Vector3.inl" />
<Unit filename="..\..\src\SFML\System\Clock.cpp" /> <Unit filename="..\..\src\SFML\System\Clock.cpp" />
<Unit filename="..\..\src\SFML\System\Err.cpp" />
<Unit filename="..\..\src\SFML\System\Lock.cpp" /> <Unit filename="..\..\src\SFML\System\Lock.cpp" />
<Unit filename="..\..\src\SFML\System\Mutex.cpp" /> <Unit filename="..\..\src\SFML\System\Mutex.cpp" />
<Unit filename="..\..\src\SFML\System\Platform.hpp" /> <Unit filename="..\..\src\SFML\System\Platform.hpp" />

View File

@ -382,6 +382,14 @@
RelativePath="..\..\include\SFML\System\Clock.hpp" RelativePath="..\..\include\SFML\System\Clock.hpp"
> >
</File> </File>
<File
RelativePath="..\..\src\SFML\System\Err.cpp"
>
</File>
<File
RelativePath="..\..\include\SFML\System\Err.hpp"
>
</File>
<File <File
RelativePath="..\..\src\SFML\System\Lock.cpp" RelativePath="..\..\src\SFML\System\Lock.cpp"
> >

View File

@ -674,7 +674,7 @@ Key::Code WindowImplWin32::VirtualKeyCodeToSF(WPARAM key, LPARAM flags)
case VK_SHIFT : case VK_SHIFT :
{ {
static UINT lShift = MapVirtualKey(VK_LSHIFT, MAPVK_VK_TO_VSC); static UINT lShift = MapVirtualKey(VK_LSHIFT, MAPVK_VK_TO_VSC);
UINT scancode = (flags & (0xFF << 16)) >> 16; UINT scancode = static_cast<UINT>((flags & (0xFF << 16)) >> 16);
return scancode == lShift ? Key::LShift : Key::RShift; return scancode == lShift ? Key::LShift : Key::RShift;
} }