Ticket #2804: freebsd10.diff
File freebsd10.diff, 4.1 KB (added by , 10 years ago) |
---|
-
build/premake/extern_libs4.lua
235 235 -- Suppress all the Boost warnings on OS X by including it as a system directory 236 236 buildoptions { "-isystem../" .. libraries_dir .. "boost/include" } 237 237 end 238 if os.getversion().description == "OpenBSD" then 238 -- TODO This actually applies to most libraries we use on BSDs, make this a global setting. 239 if os.is("bsd") then 239 240 includedirs { "/usr/local/include" } 240 241 end 241 242 end, … … 347 348 elseif os.is("macosx") then 348 349 add_default_include_paths("iconv") 349 350 defines { "LIBICONV_STATIC" } 351 -- TODO Check OpenBSD 352 elseif os.getversion().description == "FreeBSD" then 353 defines { "HAVE_ICONV_CONST" } 350 354 end 351 355 end, 352 356 link_settings = function() … … 357 361 win_names = { "libiconv" }, 358 362 -- TODO: glibc provides symbols for this, so we should only include that (and depend on libiconv) on non-glibc unix 359 363 osx_names = { "iconv" }, 364 bsd_names = { "iconv" }, 360 365 dbg_suffix = "", 361 366 }) 362 367 end, -
build/premake/premake4.lua
37 37 38 38 dofile("extern_libs4.lua") 39 39 40 cc = os.getenv("CC") 41 if cc == nil or cc == "" then 42 -- TODO check if gcc exists and not on OS X 43 -- else use clang if present 44 cc = "gcc" 45 end 46 40 47 -- detect CPU architecture (simplistic, currently only supports x86, amd64 and ARM) 41 48 arch = "x86" 42 49 if _OPTIONS["android"] then … … 50 57 if arch == "x86_64" or arch == "amd64" then 51 58 arch = "amd64" 52 59 else 53 os.execute( "gcc-dumpmachine > .gccmachine.tmp")60 os.execute(cc .. " -dumpmachine > .gccmachine.tmp") 54 61 local f = io.open(".gccmachine.tmp", "r") 55 62 local machine = f:read("*line") 56 63 f:close() … … 108 115 -- It's too late to do this test by the time we start compiling the PCH file, so 109 116 -- do the test in this build script instead (which is kind of ugly - please fix if 110 117 -- you have a better idea) 111 if not _OPTIONS["icc"] then118 if not _OPTIONS["icc"] and cc == "gcc" then 112 119 os.execute("gcc -dumpversion > .gccver.tmp") 113 120 local f = io.open(".gccver.tmp", "r") 114 121 major, dot, minor = f:read(1, 1, 1) … … 392 399 if not os.is("windows") and not os.is("macosx") then 393 400 -- X11 includes may be installed in one of a gadzillion of three places 394 401 -- Famous last words: "You can't include too much! ;-)" 402 -- TODO update comment (or add /usr/local/ as an include search path for BSDs) 395 403 includedirs { 396 404 "/usr/X11R6/include/X11", 397 405 "/usr/X11R6/include", 406 "/usr/local/include/X11", 407 "/usr/local/include", 398 408 "/usr/include/X11" 399 409 } 400 410 libdirs { "/usr/X11R6/lib" } -
libraries/source/fcollada/src/FCollada/FUtils/FUStringConversion.cpp
247 247 template FMVector4 FUStringConversion::ToVector4<char>(const char**); 248 248 249 249 template bool FUStringConversion::ToBoolean<char>(const char*); 250 template int FUStringConversion::ToInt32<char>(const char**); 250 251 template unsigned int FUStringConversion::ToUInt32<char>(const char**); 251 252 template unsigned int FUStringConversion::HexToUInt32<char>(const char**, unsigned int); 252 253 -
source/tools/atlas/AtlasUI/ScenarioEditor/Tools/TransformObject.cpp
158 158 wxString x(xmlData->GetNodeContent()); 159 159 unsigned long xTmp = 0; 160 160 x.ToULong(&xTmp); 161 wxASSERT(xTmp <= (unsigned long) UINT32_MAX);161 wxASSERT(xTmp <= (unsigned long)std::numeric_limits<unsigned int>::max()); 162 162 actorSeed = xTmp; 163 163 } 164 164