From 5fb16724e6f68273762f692f47245773a820f352 Mon Sep 17 00:00:00 2001 From: Lynix Date: Thu, 9 Jun 2016 12:32:04 +0200 Subject: [PATCH 1/3] Build: Fix build on Premake4 Former-commit-id: e4b767d8f806cf4350145d4b89fc875efb6c5c38 [formerly 342808bdd0ca5aa81301db4e5aa7656716a7323c] Former-commit-id: ba1724ff6d933ca7b101873857d489a9d51092ff --- build/scripts/common.lua | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/build/scripts/common.lua b/build/scripts/common.lua index 7e3cb2c33..5124dcace 100644 --- a/build/scripts/common.lua +++ b/build/scripts/common.lua @@ -7,9 +7,9 @@ function NazaraBuild:Execute() local platformData if (os.is64bit()) then - platformData = {"x64", "x86"} + platformData = {"x64", "x32"} else - platformData = {"x86", "x64"} + platformData = {"x32", "x64"} end if (self.Actions[_ACTION] == nil) then @@ -30,13 +30,13 @@ function NazaraBuild:Execute() location(_ACTION) kind("StaticLib") - configuration("x86") + configuration("x32") libdirs("../extlibs/lib/common/x86") configuration("x64") libdirs("../extlibs/lib/common/x64") - configuration({"codeblocks or codelite or gmake", "x86"}) + configuration({"codeblocks or codelite or gmake", "x32"}) libdirs("../extlibs/lib/" .. makeLibDir .. "/x86") targetdir("../extlibs/lib/" .. makeLibDir .. "/x86") @@ -47,7 +47,7 @@ function NazaraBuild:Execute() configuration("vs*") buildoptions("/MP") - configuration({"vs*", "x86"}) + configuration({"vs*", "x32"}) libdirs("../extlibs/lib/msvc/x86") targetdir("../extlibs/lib/msvc/x86") @@ -55,7 +55,7 @@ function NazaraBuild:Execute() libdirs("../extlibs/lib/msvc/x64") targetdir("../extlibs/lib/msvc/x64") - configuration({"xcode3 or xcode4", "x86"}) + configuration({"xcode3 or xcode4", "x32"}) libdirs("../extlibs/lib/xcode/x86") targetdir("../extlibs/lib/xcode/x86") @@ -178,14 +178,14 @@ function NazaraBuild:Execute() libdirs("../lib") libdirs("../extlibs/lib/common") - configuration("x86") + configuration("x32") libdirs("../extlibs/lib/common/x86") configuration("x64") defines("NAZARA_PLATFORM_x64") libdirs("../extlibs/lib/common/x64") - configuration({"codeblocks or codelite or gmake", "x86"}) + configuration({"codeblocks or codelite or gmake", "x32"}) libdirs("../extlibs/lib/" .. makeLibDir .. "/x86") libdirs("../lib/" .. makeLibDir .. "/x86") targetdir("../lib/" .. makeLibDir .. "/x86") @@ -198,7 +198,7 @@ function NazaraBuild:Execute() -- Copy the module binaries to the example folder self:MakeCopyAfterBuild(moduleTable) - configuration({"vs*", "x86"}) + configuration({"vs*", "x32"}) libdirs("../extlibs/lib/msvc/x86") libdirs("../lib/msvc/x86") targetdir("../lib/msvc/x86") @@ -208,7 +208,7 @@ function NazaraBuild:Execute() libdirs("../lib/msvc/x64") targetdir("../lib/msvc/x64") - configuration({"xcode3 or xcode4", "x86"}) + configuration({"xcode3 or xcode4", "x32"}) libdirs("../extlibs/lib/xcode/x86") libdirs("../lib/xcode/x86") targetdir("../lib/xcode/x86") @@ -283,14 +283,14 @@ function NazaraBuild:Execute() libdirs("../lib") libdirs("../extlibs/lib/common") - configuration("x86") + configuration("x32") libdirs("../extlibs/lib/common/x86") configuration("x64") defines("NAZARA_PLATFORM_x64") libdirs("../extlibs/lib/common/x64") - configuration({"codeblocks or codelite or gmake", "x86"}) + configuration({"codeblocks or codelite or gmake", "x32"}) libdirs("../extlibs/lib/" .. makeLibDir .. "/x86") libdirs("../lib/" .. makeLibDir .. "/x86") if (toolTable.Kind == "library") then @@ -313,7 +313,7 @@ function NazaraBuild:Execute() self:MakeCopyAfterBuild(toolTable) end - configuration({"vs*", "x86"}) + configuration({"vs*", "x32"}) libdirs("../extlibs/lib/msvc/x86") libdirs("../lib/msvc/x86") if (toolTable.Kind == "library") then @@ -331,7 +331,7 @@ function NazaraBuild:Execute() targetdir("../plugins/" .. toolTable.Name .. "/lib/msvc/x64") end - configuration({"xcode3 or xcode4", "x86"}) + configuration({"xcode3 or xcode4", "x32"}) libdirs("../extlibs/lib/xcode/x86") libdirs("../lib/xcode/x86") if (toolTable.Kind == "library") then @@ -411,26 +411,26 @@ function NazaraBuild:Execute() includedirs(exampleTable.Includes) links(exampleTable.Libraries) - configuration("x86") + configuration("x32") libdirs("../extlibs/lib/common/x86") configuration("x64") defines("NAZARA_PLATFORM_x64") libdirs("../extlibs/lib/common/x64") - configuration({"codeblocks or codelite or gmake", "x86"}) + configuration({"codeblocks or codelite or gmake", "x32"}) libdirs("../lib/" .. makeLibDir .. "/x86") configuration({"codeblocks or codelite or gmake", "x64"}) libdirs("../lib/" .. makeLibDir .. "/x64") - configuration({"vs*", "x86"}) + configuration({"vs*", "x32"}) libdirs("../lib/msvc/x86") configuration({"vs*", "x64"}) libdirs("../lib/msvc/x64") - configuration({"xcode3 or xcode4", "x86"}) + configuration({"xcode3 or xcode4", "x32"}) libdirs("../lib/xcode/x86") configuration({"xcode3 or xcode4", "x64"}) @@ -906,8 +906,8 @@ function NazaraBuild:MakeCopyAfterBuild(infoTable) for k,v in pairs(table.join(infoTable.Libraries, infoTable.DynLib)) do local paths = {} - table.insert(paths, {"x86", "../extlibs/lib/common/x86/" .. v .. ".dll"}) - table.insert(paths, {"x86", "../extlibs/lib/common/x86/lib" .. v .. ".dll"}) + table.insert(paths, {"x32", "../extlibs/lib/common/x86/" .. v .. ".dll"}) + table.insert(paths, {"x32", "../extlibs/lib/common/x86/lib" .. v .. ".dll"}) table.insert(paths, {"x64", "../extlibs/lib/common/x64/" .. v .. ".dll"}) table.insert(paths, {"x64", "../extlibs/lib/common/x64/lib" .. v .. ".dll"}) From f74f1800445986117a5077c5d8c53395e1c48e73 Mon Sep 17 00:00:00 2001 From: Lynix Date: Thu, 9 Jun 2016 13:02:02 +0200 Subject: [PATCH 2/3] Fix compilation for CodeBlocks 16.01 ! (Fixes #65) Former-commit-id: f49f9b662c6e105d1249f7f7839f8a711be87640 [formerly ab9e2158aebc0583790b52d6397015fe470c0a31] Former-commit-id: d68b86c1319bdfd956b226865831e7c2d0a5ea42 --- build/scripts/common.lua | 6 +++++- src/Nazara/Network/Win32/SocketImpl.cpp | 23 +++++++++++++++++++---- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/build/scripts/common.lua b/build/scripts/common.lua index 5124dcace..f08828e3b 100644 --- a/build/scripts/common.lua +++ b/build/scripts/common.lua @@ -83,7 +83,7 @@ function NazaraBuild:Execute() targetsuffix("-s") configuration("codeblocks or codelite or gmake or xcode3 or xcode4") - buildoptions({"-fPIC", "-std=c++14"}) + buildoptions({"-fPIC", "-std=c++14", "-U__STRICT_ANSI__"}) for k, libTable in ipairs(self.OrderedExtLibs) do project(libTable.Name) @@ -900,6 +900,10 @@ function NazaraBuild:Resolve(infoTable) end function NazaraBuild:MakeCopyAfterBuild(infoTable) + if (PremakeVersion < 50) then + return + end + if (os.is("windows")) then configuration({}) postbuildcommands({[[xcopy "%{path.translate(cfg.linktarget.relpath):sub(1, -5) .. ".dll"}" "..\..\..\examples\bin\" /E /Y]]}) diff --git a/src/Nazara/Network/Win32/SocketImpl.cpp b/src/Nazara/Network/Win32/SocketImpl.cpp index 35d4b2371..9e5846471 100644 --- a/src/Nazara/Network/Win32/SocketImpl.cpp +++ b/src/Nazara/Network/Win32/SocketImpl.cpp @@ -6,7 +6,22 @@ #include #include #include -#include + +#include +#ifdef NAZARA_COMPILER_MINGW +// MinGW is lacking Mstcpip.h and that's too bad +struct tcp_keepalive +{ + u_long onoff; + u_long keepalivetime; + u_long keepaliveinterval; +}; + +#define SIO_KEEPALIVE_VALS _WSAIOW(IOC_VENDOR,4) +#else + #include +#endif // NAZARA_COMPILER_MINGW + #include namespace Nz @@ -93,7 +108,7 @@ namespace Nz IpAddressImpl::SockAddrBuffer nameBuffer; int bufferLength = IpAddressImpl::ToSockAddr(address, nameBuffer.data()); - + if (error) *error = SocketError_NoError; @@ -365,7 +380,7 @@ namespace Nz return IpAddress(); } - + if (error) *error = SocketError_NoError; @@ -566,7 +581,7 @@ namespace Nz return true; } - + bool SocketImpl::SetBroadcasting(SocketHandle handle, bool broadcasting, SocketError* error) { NazaraAssert(handle != InvalidHandle, "Invalid handle"); From f7eeda0a1f11d050556838585c0bd5c80be75eaa Mon Sep 17 00:00:00 2001 From: Lynix Date: Fri, 10 Jun 2016 12:40:31 +0200 Subject: [PATCH 3/3] Network/RUdpConnection: Remove useless line Former-commit-id: 03abb4d33dbf11efe2088ae9d403fbcd74217c4d [formerly 3672d0f6c5848d1fbe493f79ca9dc79fca45b34d] Former-commit-id: d9c9067cf538507bfd75c7d7e25051fecc96dab2 --- include/Nazara/Network/RUdpConnection.inl | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/Nazara/Network/RUdpConnection.inl b/include/Nazara/Network/RUdpConnection.inl index 48173bd77..2960cbced 100644 --- a/include/Nazara/Network/RUdpConnection.inl +++ b/include/Nazara/Network/RUdpConnection.inl @@ -149,8 +149,6 @@ namespace Nz std::vector& pendingPackets = peer.pendingPackets[priority]; if (!pendingPackets.empty()) return true; - - pendingPackets.clear(); } return false;