Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed the linker warning about conflicting libraries in Visual C++ projects

Browse Source 
Fixed a minor warning in UdpSocket.cpp


git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1497 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
LaurentGom 2010-04-07 10:03:09 +00:00
parent a6b9dbfd39
commit af22a15df3
6 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CSFML/build/VC2005/csfml-graphics.vcproj
View File

@ -75,6 +75,7 @@
OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-d.dll" OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-d.dll"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="$(SolutionDir)..\..\..\lib\vc2005\" AdditionalLibraryDirectories="$(SolutionDir)..\..\..\lib\vc2005\"
IgnoreDefaultLibraryNames="libc.lib;libcmt.lib;msvcrt.lib;libcd.lib;libcmtd.lib"
ModuleDefinitionFile="$(SolutionDir)../../src/SFML/Graphics/csfml-graphics-d.def" ModuleDefinitionFile="$(SolutionDir)../../src/SFML/Graphics/csfml-graphics-d.def"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb"
@ -164,6 +165,7 @@
OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName).dll" OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName).dll"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="$(SolutionDir)..\..\..\lib\vc2005\" AdditionalLibraryDirectories="$(SolutionDir)..\..\..\lib\vc2005\"
IgnoreDefaultLibraryNames="libc.lib;libcmt.lib;msvcrtd.lib;libcd.lib;libcmtd.lib"
ModuleDefinitionFile="$(SolutionDir)../../src/SFML/Graphics/csfml-graphics.def" ModuleDefinitionFile="$(SolutionDir)../../src/SFML/Graphics/csfml-graphics.def"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb"

2
CSFML/build/VC2008/csfml-graphics.vcproj
View File

@ -76,6 +76,7 @@
OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName)-d.dll" OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName)-d.dll"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="$(SolutionDir)..\..\..\lib\vc2008\" AdditionalLibraryDirectories="$(SolutionDir)..\..\..\lib\vc2008\"
IgnoreDefaultLibraryNames="libc.lib;libcmt.lib;msvcrt.lib;libcd.lib;libcmtd.lib"
ModuleDefinitionFile="$(SolutionDir)../../src/SFML/Graphics/csfml-graphics-d.def" ModuleDefinitionFile="$(SolutionDir)../../src/SFML/Graphics/csfml-graphics-d.def"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb"
@ -164,6 +165,7 @@
OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName).dll" OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName).dll"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="$(SolutionDir)..\..\..\lib\vc2008\" AdditionalLibraryDirectories="$(SolutionDir)..\..\..\lib\vc2008\"
IgnoreDefaultLibraryNames="libc.lib, libcmt.lib, msvcrtd.lib, libcd.lib, libcmtd.lib"
ModuleDefinitionFile="$(SolutionDir)../../src/SFML/Graphics/csfml-graphics.def" ModuleDefinitionFile="$(SolutionDir)../../src/SFML/Graphics/csfml-graphics.def"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb"

2
build/vc2005/sfml-graphics.vcproj
View File

@ -75,6 +75,7 @@
OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-d.dll" OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-d.dll"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""
IgnoreDefaultLibraryNames="libc.lib;libcmt.lib;msvcrt.lib;libcd.lib;libcmtd.lib"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb"
SubSystem="2" SubSystem="2"
@ -170,6 +171,7 @@
OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName).dll" OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName).dll"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""
IgnoreDefaultLibraryNames="libc.lib;libcmt.lib;msvcrtd.lib;libcd.lib;libcmtd.lib"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb"
SubSystem="2" SubSystem="2"

3
build/vc2008/sfml-graphics.vcproj
View File

@ -76,6 +76,7 @@
OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName)-d.dll" OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName)-d.dll"
LinkIncremental="2" LinkIncremental="2"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""
IgnoreDefaultLibraryNames="libc.lib;libcmt.lib;msvcrt.lib;libcd.lib;libcmtd.lib"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb"
SubSystem="2" SubSystem="2"
@ -170,6 +171,7 @@
OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName).dll" OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName).dll"
LinkIncremental="1" LinkIncremental="1"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""
IgnoreDefaultLibraryNames="libc.lib;libcmt.lib;msvcrtd.lib;libcd.lib;libcmtd.lib"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb"
SubSystem="2" SubSystem="2"
@ -255,6 +257,7 @@
/> />
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
AdditionalOptions="/VERBOSE:LIB"
AdditionalDependencies="opengl32.lib &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\freetype.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\glew.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\jpeg.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\png.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\soil.lib&quot;" AdditionalDependencies="opengl32.lib &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\freetype.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\glew.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\jpeg.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\png.lib&quot; &quot;$(SolutionDir)..\..\extlibs\libs-vc2005\soil.lib&quot;"
OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName)-s-d.lib" OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName)-s-d.lib"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""

2
src/SFML/Graphics/Image.cpp
View File

@ -59,7 +59,7 @@ myPixelsFlipped (false)
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Copy constructor /// Copy constructor
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
Image::Image(const Image& copy) : Image::Image(const Image& copy) :
Resource<Image>() Resource<Image>()
{ {
// First make sure that the source image is up-to-date // First make sure that the source image is up-to-date

2
src/SFML/Network/UdpSocket.cpp
View File

@ -107,7 +107,7 @@ Socket::Status UdpSocket::Send(const char* data, std::size_t size, const IpAddre
sockaddr_in address = priv::SocketImpl::CreateAddress(remoteAddress.ToInteger(), remotePort); sockaddr_in address = priv::SocketImpl::CreateAddress(remoteAddress.ToInteger(), remotePort);
// Send the data (unlike TCP, all the data is always sent in one call) // Send the data (unlike TCP, all the data is always sent in one call)
int sent = sendto(GetHandle(), data, size, 0, reinterpret_cast<sockaddr*>(&address), sizeof(address)); int sent = sendto(GetHandle(), data, static_cast<int>(size), 0, reinterpret_cast<sockaddr*>(&address), sizeof(address));
// Check for errors // Check for errors
if (sent < 0) if (sent < 0)