mirror of
https://github.com/lihop/godot-xterm.git
synced 2024-11-10 04:40:25 +01:00
Fix macOS builds
This commit is contained in:
parent
3e67cfd877
commit
10983653c6
2 changed files with 5 additions and 5 deletions
|
@ -3,7 +3,7 @@
|
|||
#if !defined(_PTY_DISABLED)
|
||||
#include "libuv_utils.h"
|
||||
#include "pipe.h"
|
||||
#if defined(__unix__)
|
||||
#if defined(__linux__) || defined(__APPLE__)
|
||||
#include "node_pty/unix/pty.h"
|
||||
#endif
|
||||
#if defined(__WIN32)
|
||||
|
@ -26,7 +26,7 @@ extern "C" void GDN_EXPORT godot_nativescript_init(void *handle) {
|
|||
#if !defined(_PTY_DISABLED)
|
||||
godot::register_tool_class<godot::Pipe>();
|
||||
godot::register_tool_class<godot::LibuvUtils>();
|
||||
#if defined(__unix__)
|
||||
#if defined(__linux__) || defined(__APPLE__)
|
||||
godot::register_tool_class<godot::PTYUnix>();
|
||||
#endif
|
||||
#if defined(__WIN32)
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
#include <xkbcommon/xkbcommon-keysyms.h>
|
||||
|
||||
// For _populate_key_list(), see below.
|
||||
#if !defined(__EMSCRIPTEN__)
|
||||
#if !defined(__EMSCRIPTEN__) && !defined(__APPLE__)
|
||||
#include <GlobalConstants.hpp>
|
||||
#endif
|
||||
|
||||
|
@ -26,7 +26,7 @@ void Terminal::_populate_key_list() {
|
|||
// GlobalConstants from the header: abort(Assertion failed: bad export type for
|
||||
// `_ZN5godot15GlobalConstants8KEY_KP_0E`: undefined). Build with -s
|
||||
// ASSERTIONS=1 for more info.
|
||||
#if !defined(__EMSCRIPTEN__)
|
||||
#if !defined(__EMSCRIPTEN__) && !defined(__APPLE__)
|
||||
#define GLOBAL_CONSTANT(VAR) GlobalConstants::VAR
|
||||
#else
|
||||
#define GLOBAL_CONSTANT(VAR) get_constant(#VAR)
|
||||
|
@ -650,4 +650,4 @@ String Terminal::copy_all() {
|
|||
String result = String(out);
|
||||
std::free(out);
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue