Jasima/godot-xterm
1
0
Fork 0
mirror of https://github.com/lihop/godot-xterm.git synced 2025-07-03 20:45:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

changed types for 32-bit windows compat and bandaid fix for win release build CRT

Browse source
This commit is contained in:
Alexander Treml 2025-07-02 10:56:52 +02:00
parent e2fb97ac91
commit 65e1391837
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
addons/godot_xterm/native/SConstruct
View file

@ -31,11 +31,12 @@ elif env['platform'] == 'windows':
env.Append(LIBS=['ws2_32.lib', 'Advapi32', 'User32', 'Userenv', 'iphlpapi']) env.Append(LIBS=['ws2_32.lib', 'Advapi32', 'User32', 'Userenv', 'iphlpapi'])
if env["target"] == "template_release": if env["target"] == "template_release":
env.Append(LIBS=[env.File('thirdparty/libuv/build/Release/uv_a.lib')]) env.Append(LIBS=[env.File('thirdparty/libuv/build/Release/uv_a.lib')])
# TODO(ast) this is a bandaid fix (see https://stackoverflow.com/questions/3007312/resolving-lnk4098-defaultlib-msvcrt-conflicts-with)
env.Append(LINKFLAGS=['/VERBOSE:LIB', '/NODEFAULTLIB:libcmtd.lib', '/NODEFAULTLIB:libcmt.lib', '/NODEFAULTLIB:msvcrtd.lib'])
else: else:
env.Append(LIBS=[env.File('thirdparty/libuv/build/Debug/uv_a.lib')]) env.Append(LIBS=[env.File('thirdparty/libuv/build/Debug/uv_a.lib')])
# TODO(ast) this is a bandaid fix (see https://stackoverflow.com/questions/3007312/resolving-lnk4098-defaultlib-msvcrt-conflicts-with) # TODO(ast) this is a bandaid fix (see https://stackoverflow.com/questions/3007312/resolving-lnk4098-defaultlib-msvcrt-conflicts-with)
# TODO(ast) a release build needs to use msvcrt instead of msvcrtd env.Append(LINKFLAGS=['/VERBOSE:LIB', '/NODEFAULTLIB:libcmtd.lib', '/NODEFAULTLIB:libcmt.lib', '/NODEFAULTLIB:msvcrt.lib'])
env.Append(LINKFLAGS=['/VERBOSE:LIB', '/NODEFAULTLIB:libcmtd.lib', '/NODEFAULTLIB:libcmt.lib', '/NODEFAULTLIB:msvcrt.lib'])
else: else:
env.Append(CPPDEFINES=['_PTY_DISABLED']) env.Append(CPPDEFINES=['_PTY_DISABLED'])

2
addons/godot_xterm/native/src/pty_win.cpp
View file

@ -363,7 +363,7 @@ HRESULT InitializeStartupInfoAttachedToPseudoConsole(STARTUPINFOEX *pStartupInfo
if (pStartupInfo) if (pStartupInfo)
{ {
size_t attrListSize{}; SIZE_T attrListSize{};
pStartupInfo->StartupInfo.cb = sizeof(STARTUPINFOEX); pStartupInfo->StartupInfo.cb = sizeof(STARTUPINFOEX);