godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12190 from marcelofg55/bsd_fixes 

Fix BSD compile issues

[ci skip]
This commit is contained in:
Rémi Verschelde 2017-10-20 12:42:02 +02:00 committed by GitHub
parent 5e348e72c1 2baf54526b
commit 3517e791ce
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
platform/x11/detect.py
View File

@ -239,6 +239,9 @@ def configure(env):
if (platform.system() == "Linux"): if (platform.system() == "Linux"):
env.Append(LIBS=['dl']) env.Append(LIBS=['dl'])
if (platform.system().find("BSD") >= 0):
env.Append(LIBS=['execinfo'])
## Cross-compilation ## Cross-compilation
if (is64 and env["bits"] == "32"): if (is64 and env["bits"] == "32"):

6
platform/x11/os_x11.cpp
View File

@ -35,7 +35,11 @@
#include "servers/physics/physics_server_sw.h" #include "servers/physics/physics_server_sw.h"
#include "servers/visual/visual_server_raster.h" #include "servers/visual/visual_server_raster.h"
#include "servers/visual/visual_server_wrap_mt.h" #include "servers/visual/visual_server_wrap_mt.h"
#ifdef HAVE_MNTENT
#include <mntent.h> #include <mntent.h>
#endif
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -2182,6 +2186,7 @@ static String get_mountpoint(const String &p_path) {
return ""; return "";
} }
#ifdef HAVE_MNTENT
dev_t dev = s.st_dev; dev_t dev = s.st_dev;
FILE *fd = setmntent("/proc/mounts", "r"); FILE *fd = setmntent("/proc/mounts", "r");
if (!fd) { if (!fd) {
@ -2199,6 +2204,7 @@ static String get_mountpoint(const String &p_path) {
} }
endmntent(fd); endmntent(fd);
#endif
return ""; return "";
} }

1
thirdparty/enet/enet/enet.h vendored
View File

@ -10,6 +10,7 @@ extern "C"
{ {
#endif #endif
#include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include "enet/godot.h" #include "enet/godot.h"