Merge pull request #12190 from marcelofg55/bsd_fixes
Fix BSD compile issues [ci skip]
This commit is contained in:
commit
3517e791ce
3 changed files with 10 additions and 0 deletions
|
@ -239,6 +239,9 @@ def configure(env):
|
|||
if (platform.system() == "Linux"):
|
||||
env.Append(LIBS=['dl'])
|
||||
|
||||
if (platform.system().find("BSD") >= 0):
|
||||
env.Append(LIBS=['execinfo'])
|
||||
|
||||
## Cross-compilation
|
||||
|
||||
if (is64 and env["bits"] == "32"):
|
||||
|
|
|
@ -35,7 +35,11 @@
|
|||
#include "servers/physics/physics_server_sw.h"
|
||||
#include "servers/visual/visual_server_raster.h"
|
||||
#include "servers/visual/visual_server_wrap_mt.h"
|
||||
|
||||
#ifdef HAVE_MNTENT
|
||||
#include <mntent.h>
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
@ -2182,6 +2186,7 @@ static String get_mountpoint(const String &p_path) {
|
|||
return "";
|
||||
}
|
||||
|
||||
#ifdef HAVE_MNTENT
|
||||
dev_t dev = s.st_dev;
|
||||
FILE *fd = setmntent("/proc/mounts", "r");
|
||||
if (!fd) {
|
||||
|
@ -2199,6 +2204,7 @@ static String get_mountpoint(const String &p_path) {
|
|||
}
|
||||
|
||||
endmntent(fd);
|
||||
#endif
|
||||
return "";
|
||||
}
|
||||
|
||||
|
|
1
thirdparty/enet/enet/enet.h
vendored
1
thirdparty/enet/enet/enet.h
vendored
|
@ -10,6 +10,7 @@ extern "C"
|
|||
{
|
||||
#endif
|
||||
|
||||
#include <stdint.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "enet/godot.h"
|
||||
|
|
Loading…
Reference in a new issue