FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge FreeBSD patches.

Browse Source 
Taken from:
http://svnweb.freebsd.org/ports/head/devel/simgear/files/
This commit is contained in:
James Turner 2014-11-11 22:29:24 +00:00
parent 365ddb84a7
commit 1b7f310ea6
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -276,12 +276,12 @@ SET(CMAKE_MINSIZEREL_POSTFIX "" CACHE STRING "add a postfix, usually empty on wi
# isnan might not be real symbol, so can't check using function_exists # isnan might not be real symbol, so can't check using function_exists
check_cxx_source_compiles( check_cxx_source_compiles(
"#include <cmath> "#include <cmath>
void f() { isnan(0.0);} " int main() { return isnan(0.0);} "
HAVE_ISNAN) HAVE_ISNAN)
check_cxx_source_compiles( check_cxx_source_compiles(
"#include <cmath> "#include <cmath>
void f() { std::isnan(0.0);} " int main() { return std::isnan(0.0);} "
HAVE_STD_ISNAN) HAVE_STD_ISNAN)
if(CMAKE_COMPILER_IS_GNUCXX) if(CMAKE_COMPILER_IS_GNUCXX)

2
simgear/canvas/ShivaVG/src/shDefs.h
View File

@ -156,7 +156,7 @@ SHfloat getMaxFloat();
/* OpenGL headers */ /* OpenGL headers */
#if defined(VG_API_LINUX) #if defined(VG_API_LINUX) || defined(VG_API_FREEBSD)
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glx.h> #include <GL/glx.h>
#elif defined(VG_API_MACOSX) #elif defined(VG_API_MACOSX)

2
simgear/debug/BufferedLogCallback.cxx
View File

@ -26,6 +26,8 @@
#include <simgear/sg_inlines.h> #include <simgear/sg_inlines.h>
#include <simgear/threads/SGThread.hxx> #include <simgear/threads/SGThread.hxx>
#include <simgear/threads/SGGuard.hxx> #include <simgear/threads/SGGuard.hxx>
#include <cstdlib> // for malloc
namespace simgear namespace simgear
{ {