Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-10 14:12:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix server build on FreeBSD

Browse Source
This commit is contained in:
Fabio Alessandrelli 2018-03-01 01:25:16 +01:00
parent 8df449100a
commit 8f9914bd94
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
platform/server/detect.py
View File

@ -1,4 +1,5 @@
import os
import platform
import sys
@ -132,7 +133,12 @@ def configure(env):
env.Append(CPPPATH=['#platform/server'])
env.Append(CPPFLAGS=['-DSERVER_ENABLED', '-DUNIX_ENABLED'])
env.Append(LIBS=['pthread'])
env.Append(LIBS=['dl'])
if (platform.system() == "Linux"):
env.Append(LIBS=['dl'])
if (platform.system().find("BSD") >= 0):
env.Append(LIBS=['execinfo'])
# Link those statically for portability
if env['use_static_cpp']:

6
platform/server/platform_config.h
View File

@ -28,4 +28,10 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifdef __linux__
#include <alloca.h>
#endif
#if defined(__FreeBSD__) || defined(__OpenBSD__)
#include <stdlib.h>
#define PTHREAD_BSD_SET_NAME
#endif

3
platform/x11/crash_handler_x11.cpp
View File

@ -32,8 +32,9 @@
#define CRASH_HANDLER_ENABLED 1
#endif
#include "crash_handler_x11.h"
#include "main/main.h"
#include "os_x11.h"
#include "os/os.h"
#include "project_settings.h"
#ifdef CRASH_HANDLER_ENABLED