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

Linux/BSD: Add LINUXBSD_ENABLED define for non X11-related checks

Browse Source
This commit is contained in:
Rémi Verschelde 2023-01-16 17:01:35 +01:00
parent 629796c333
commit 91a54cdbc1
No known key found for this signature in database
GPG Key ID: C3336907360768E1
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/input/input_builders.py
View File

@ -45,7 +45,7 @@ def make_default_controller_mappings(target, source, env):
platform_mappings[current_platform][guid] = line platform_mappings[current_platform][guid] = line
platform_variables = { platform_variables = {
"Linux": "#if X11_ENABLED", "Linux": "#if LINUXBSD_ENABLED",
"Windows": "#ifdef WINDOWS_ENABLED", "Windows": "#ifdef WINDOWS_ENABLED",
"Mac OS X": "#ifdef MACOS_ENABLED", "Mac OS X": "#ifdef MACOS_ENABLED",
"Android": "#if defined(__ANDROID__)", "Android": "#if defined(__ANDROID__)",

4
drivers/unix/dir_access_unix.cpp
View File

@ -189,7 +189,7 @@ void DirAccessUnix::list_dir_end() {
_cisdir = false; _cisdir = false;
} }
#if defined(HAVE_MNTENT) && defined(X11_ENABLED) #if defined(HAVE_MNTENT) && defined(LINUXBSD_ENABLED)
static bool _filter_drive(struct mntent *mnt) { static bool _filter_drive(struct mntent *mnt) {
// Ignore devices that don't point to /dev // Ignore devices that don't point to /dev
if (strncmp(mnt->mnt_fsname, "/dev", 4) != 0) { if (strncmp(mnt->mnt_fsname, "/dev", 4) != 0) {
@ -213,7 +213,7 @@ static void _get_drives(List<String> *list) {
// Add root. // Add root.
list->push_back("/"); list->push_back("/");
#if defined(HAVE_MNTENT) && defined(X11_ENABLED) #if defined(HAVE_MNTENT) && defined(LINUXBSD_ENABLED)
// Check /etc/mtab for the list of mounted partitions. // Check /etc/mtab for the list of mounted partitions.
FILE *mtab = setmntent("/etc/mtab", "r"); FILE *mtab = setmntent("/etc/mtab", "r");
if (mtab) { if (mtab) {

6
platform/ios/export/export_plugin.cpp
View File

@ -1572,7 +1572,7 @@ Error EditorExportPlatformIOS::export_project(const Ref<EditorExportPreset> &p_p
int ret = unzGoToFirstFile(src_pkg_zip); int ret = unzGoToFirstFile(src_pkg_zip);
Vector<uint8_t> project_file_data; Vector<uint8_t> project_file_data;
while (ret == UNZ_OK) { while (ret == UNZ_OK) {
#if defined(MACOS_ENABLED) || defined(X11_ENABLED) #if defined(MACOS_ENABLED) || defined(LINUXBSD_ENABLED)
bool is_execute = false; bool is_execute = false;
#endif #endif
@ -1605,7 +1605,7 @@ Error EditorExportPlatformIOS::export_project(const Ref<EditorExportPreset> &p_p
continue; //ignore! continue; //ignore!
} }
found_library = true; found_library = true;
#if defined(MACOS_ENABLED) || defined(X11_ENABLED) #if defined(MACOS_ENABLED) || defined(LINUXBSD_ENABLED)
is_execute = true; is_execute = true;
#endif #endif
file = file.replace(library_to_use, binary_name + ".xcframework"); file = file.replace(library_to_use, binary_name + ".xcframework");
@ -1648,7 +1648,7 @@ Error EditorExportPlatformIOS::export_project(const Ref<EditorExportPreset> &p_p
f->store_buffer(data.ptr(), data.size()); f->store_buffer(data.ptr(), data.size());
} }
#if defined(MACOS_ENABLED) || defined(X11_ENABLED) #if defined(MACOS_ENABLED) || defined(LINUXBSD_ENABLED)
if (is_execute) { if (is_execute) {
// we need execute rights on this file // we need execute rights on this file
chmod(file.utf8().get_data(), 0755); chmod(file.utf8().get_data(), 0755);

11
platform/linuxbsd/detect.py
View File

@ -338,12 +338,17 @@ def configure(env: "Environment"):
env.Prepend(CPPPATH=["#platform/linuxbsd"]) env.Prepend(CPPPATH=["#platform/linuxbsd"])
env.Append(
CPPDEFINES=[
"LINUXBSD_ENABLED",
"UNIX_ENABLED",
("_FILE_OFFSET_BITS", 64),
]
)
if env["x11"]: if env["x11"]:
env.Append(CPPDEFINES=["X11_ENABLED"]) env.Append(CPPDEFINES=["X11_ENABLED"])
env.Append(CPPDEFINES=["UNIX_ENABLED"])
env.Append(CPPDEFINES=[("_FILE_OFFSET_BITS", 64)])
if env["vulkan"]: if env["vulkan"]:
env.Append(CPPDEFINES=["VULKAN_ENABLED"]) env.Append(CPPDEFINES=["VULKAN_ENABLED"])
if not env["use_volk"]: if not env["use_volk"]: