From af22a15df3b2e6a0a4152748208ed2bb5ada81f1 Mon Sep 17 00:00:00 2001 From: LaurentGom Date: Wed, 7 Apr 2010 10:03:09 +0000 Subject: [PATCH] Fixed the linker warning about conflicting libraries in Visual C++ projects 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 --- CSFML/build/VC2005/csfml-graphics.vcproj | 2 ++ CSFML/build/VC2008/csfml-graphics.vcproj | 2 ++ build/vc2005/sfml-graphics.vcproj | 2 ++ build/vc2008/sfml-graphics.vcproj | 3 +++ src/SFML/Graphics/Image.cpp | 2 +- src/SFML/Network/UdpSocket.cpp | 2 +- 6 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CSFML/build/VC2005/csfml-graphics.vcproj b/CSFML/build/VC2005/csfml-graphics.vcproj index df53562b4..586fad99f 100644 --- a/CSFML/build/VC2005/csfml-graphics.vcproj +++ b/CSFML/build/VC2005/csfml-graphics.vcproj @@ -75,6 +75,7 @@ OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-d.dll" LinkIncremental="2" AdditionalLibraryDirectories="$(SolutionDir)..\..\..\lib\vc2005\" + IgnoreDefaultLibraryNames="libc.lib;libcmt.lib;msvcrt.lib;libcd.lib;libcmtd.lib" ModuleDefinitionFile="$(SolutionDir)../../src/SFML/Graphics/csfml-graphics-d.def" GenerateDebugInformation="true" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" @@ -164,6 +165,7 @@ OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName).dll" LinkIncremental="1" AdditionalLibraryDirectories="$(SolutionDir)..\..\..\lib\vc2005\" + IgnoreDefaultLibraryNames="libc.lib;libcmt.lib;msvcrtd.lib;libcd.lib;libcmtd.lib" ModuleDefinitionFile="$(SolutionDir)../../src/SFML/Graphics/csfml-graphics.def" GenerateDebugInformation="true" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" diff --git a/CSFML/build/VC2008/csfml-graphics.vcproj b/CSFML/build/VC2008/csfml-graphics.vcproj index 976877e6a..3e3743d41 100644 --- a/CSFML/build/VC2008/csfml-graphics.vcproj +++ b/CSFML/build/VC2008/csfml-graphics.vcproj @@ -76,6 +76,7 @@ OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName)-d.dll" LinkIncremental="2" AdditionalLibraryDirectories="$(SolutionDir)..\..\..\lib\vc2008\" + IgnoreDefaultLibraryNames="libc.lib;libcmt.lib;msvcrt.lib;libcd.lib;libcmtd.lib" ModuleDefinitionFile="$(SolutionDir)../../src/SFML/Graphics/csfml-graphics-d.def" GenerateDebugInformation="true" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" @@ -164,6 +165,7 @@ OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName).dll" LinkIncremental="1" AdditionalLibraryDirectories="$(SolutionDir)..\..\..\lib\vc2008\" + IgnoreDefaultLibraryNames="libc.lib, libcmt.lib, msvcrtd.lib, libcd.lib, libcmtd.lib" ModuleDefinitionFile="$(SolutionDir)../../src/SFML/Graphics/csfml-graphics.def" GenerateDebugInformation="true" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" diff --git a/build/vc2005/sfml-graphics.vcproj b/build/vc2005/sfml-graphics.vcproj index e66a71d31..5f0e7acf0 100644 --- a/build/vc2005/sfml-graphics.vcproj +++ b/build/vc2005/sfml-graphics.vcproj @@ -75,6 +75,7 @@ OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName)-d.dll" LinkIncremental="2" AdditionalLibraryDirectories="" + IgnoreDefaultLibraryNames="libc.lib;libcmt.lib;msvcrt.lib;libcd.lib;libcmtd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" SubSystem="2" @@ -170,6 +171,7 @@ OutputFile="$(SolutionDir)..\..\lib\vc2005\$(ProjectName).dll" LinkIncremental="1" AdditionalLibraryDirectories="" + IgnoreDefaultLibraryNames="libc.lib;libcmt.lib;msvcrtd.lib;libcd.lib;libcmtd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" SubSystem="2" diff --git a/build/vc2008/sfml-graphics.vcproj b/build/vc2008/sfml-graphics.vcproj index 970f83bfa..16f0a0a0d 100644 --- a/build/vc2008/sfml-graphics.vcproj +++ b/build/vc2008/sfml-graphics.vcproj @@ -76,6 +76,7 @@ OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName)-d.dll" LinkIncremental="2" AdditionalLibraryDirectories="" + IgnoreDefaultLibraryNames="libc.lib;libcmt.lib;msvcrt.lib;libcd.lib;libcmtd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" SubSystem="2" @@ -170,6 +171,7 @@ OutputFile="$(SolutionDir)..\..\lib\vc2008\$(ProjectName).dll" LinkIncremental="1" AdditionalLibraryDirectories="" + IgnoreDefaultLibraryNames="libc.lib;libcmt.lib;msvcrtd.lib;libcd.lib;libcmtd.lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(IntDir)$(TargetName).pdb" SubSystem="2" @@ -255,6 +257,7 @@ /> () { // First make sure that the source image is up-to-date diff --git a/src/SFML/Network/UdpSocket.cpp b/src/SFML/Network/UdpSocket.cpp index b0fd8abb7..fe46b4c60 100644 --- a/src/SFML/Network/UdpSocket.cpp +++ b/src/SFML/Network/UdpSocket.cpp @@ -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); // Send the data (unlike TCP, all the data is always sent in one call) - int sent = sendto(GetHandle(), data, size, 0, reinterpret_cast(&address), sizeof(address)); + int sent = sendto(GetHandle(), data, static_cast(size), 0, reinterpret_cast(&address), sizeof(address)); // Check for errors if (sent < 0)