From 97f6cdfbe2a20bd19c30e2488f068d40a56d712d Mon Sep 17 00:00:00 2001 From: Dmitry Tsarevich Date: Sat, 2 Dec 2023 23:59:49 +0300 Subject: [PATCH 1/3] dedicated: Fix build on Windows --- dedicated/wscript | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dedicated/wscript b/dedicated/wscript index 11e56fd0..c6a10155 100755 --- a/dedicated/wscript +++ b/dedicated/wscript @@ -38,7 +38,8 @@ def build(bld): if bld.env.DEST_OS == 'win32': source += [ - 'sys_windows.cpp' + 'sys_windows.cpp', + 'console/TextConsoleWin32.cpp' ] else: source += [ @@ -59,6 +60,9 @@ def build(bld): libs = ['tier0','vpklib','tier1','tier2','tier3','vstdlib','steam_api','appframework','mathlib', 'EDIT'] + if bld.env.DEST_OS == 'win32': + libs += ['vgui_controls', 'USER32', 'SHELL32'] + install_path = bld.env.LIBDIR bld.shlib( From a84ee9062c28024db823df8a2631374fa88907a8 Mon Sep 17 00:00:00 2001 From: nillerusr <42746659+nillerusr@users.noreply.github.com> Date: Wed, 13 Dec 2023 18:10:34 +0300 Subject: [PATCH 2/3] wscript(dedicated): fix indentation --- dedicated/wscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dedicated/wscript b/dedicated/wscript index c6a10155..abcb9d43 100755 --- a/dedicated/wscript +++ b/dedicated/wscript @@ -60,8 +60,8 @@ def build(bld): libs = ['tier0','vpklib','tier1','tier2','tier3','vstdlib','steam_api','appframework','mathlib', 'EDIT'] - if bld.env.DEST_OS == 'win32': - libs += ['vgui_controls', 'USER32', 'SHELL32'] + if bld.env.DEST_OS == 'win32': + libs += ['vgui_controls', 'USER32', 'SHELL32'] install_path = bld.env.LIBDIR From bfe1baf323519159a174572841c835a335815e1b Mon Sep 17 00:00:00 2001 From: nillerusr <42746659+nillerusr@users.noreply.github.com> Date: Wed, 13 Dec 2023 18:19:17 +0300 Subject: [PATCH 3/3] wscript(dedicated): try to fix windows build --- dedicated/wscript | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dedicated/wscript b/dedicated/wscript index abcb9d43..a81f4af3 100755 --- a/dedicated/wscript +++ b/dedicated/wscript @@ -39,6 +39,10 @@ def build(bld): if bld.env.DEST_OS == 'win32': source += [ 'sys_windows.cpp', + 'vgui/CreateMultiplayerGameServerPage.cpp', + 'vgui/MainPanel.cpp', + '../public/vgui_controls/vgui_controls.cpp', + 'vgui/vguihelpers.cpp', 'console/TextConsoleWin32.cpp' ] else: