From 0c35148fec4858c9bf33244b14cce29722305986 Mon Sep 17 00:00:00 2001 From: FreeSlave Date: Wed, 27 Nov 2024 05:29:51 +0300 Subject: [PATCH 1/4] Exclude .lib archive files from install --- .github/workflows/manual.yml | 5 ----- cl_dll/CMakeLists.txt | 3 ++- dlls/CMakeLists.txt | 3 ++- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml index 270da8750..ee000cf56 100644 --- a/.github/workflows/manual.yml +++ b/.github/workflows/manual.yml @@ -98,11 +98,6 @@ jobs: run: | copy build/cl_dll/Debug/client.pdb dist/${{ steps.extract_gamedir.outputs.gamedir }}/cl_dlls/ copy build/dlls/Debug/hl.pdb dist/${{ steps.extract_gamedir.outputs.gamedir }}/dlls/ - - name: Delete .lib files from dist - if: startsWith(matrix.os, 'windows') - run: | - Remove-Item -Force -Path dist/${{ steps.extract_gamedir.outputs.gamedir }}/cl_dlls/client.lib - Remove-Item -Force -Path dist/${{ steps.extract_gamedir.outputs.gamedir }}/dlls/hl.lib - name: Upload linux artifact if: startsWith(matrix.os, 'ubuntu') uses: actions/upload-artifact@v4 diff --git a/cl_dll/CMakeLists.txt b/cl_dll/CMakeLists.txt index c28315fbd..cbcae6ce8 100644 --- a/cl_dll/CMakeLists.txt +++ b/cl_dll/CMakeLists.txt @@ -228,7 +228,8 @@ if(HAVE_LTO) endif() install( TARGETS ${CLDLL_LIBRARY} - DESTINATION "${GAMEDIR}/${CLIENT_INSTALL_DIR}/" + RUNTIME DESTINATION "${GAMEDIR}/${CLIENT_INSTALL_DIR}/" + LIBRARY DESTINATION "${GAMEDIR}/${CLIENT_INSTALL_DIR}/" PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE ) diff --git a/dlls/CMakeLists.txt b/dlls/CMakeLists.txt index e4f63e787..3d15daf3b 100644 --- a/dlls/CMakeLists.txt +++ b/dlls/CMakeLists.txt @@ -189,7 +189,8 @@ if(HAVE_LTO) endif() install( TARGETS ${SVDLL_LIBRARY} - DESTINATION "${GAMEDIR}/${SERVER_INSTALL_DIR}/" + RUNTIME DESTINATION "${GAMEDIR}/${SERVER_INSTALL_DIR}/" + LIBRARY DESTINATION "${GAMEDIR}/${SERVER_INSTALL_DIR}/" PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) From 61f9455f7c1c43b0387f95d7b27a5d9ae3464df3 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Wed, 27 Nov 2024 18:36:24 +0300 Subject: [PATCH 2/4] wscript: omit implibs from installation --- wscript | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/wscript b/wscript index 3d1d4279a..690d785c4 100644 --- a/wscript +++ b/wscript @@ -2,7 +2,7 @@ # encoding: utf-8 # a1batross, mittorn, 2018 -from waflib import Build, Configure, Context, Logs +from waflib import Build, Configure, Context, Logs, TaskGen import sys import os import re @@ -20,6 +20,12 @@ def get_taskgen_count(self): except: idx = 0 # don't set tg_idx_count to not increase counter return idx +@TaskGen.feature('cshlib', 'cxxshlib', 'fcshlib') +@TaskGen.before_method('apply_implib') +def remove_implib_install(self): + if not getattr(self, 'install_path_implib', None): + self.install_path_implib = None + def options(opt): opt.load('reconfigure compiler_optimizations xcompile compiler_cxx compiler_c clang_compilation_database strip_on_install msdev msvs subproject') From 9a96bece576f90519e57150bc94b268a591a0264 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Wed, 27 Nov 2024 18:36:51 +0300 Subject: [PATCH 3/4] wscript: don't set subsystem flag, it's only needed for executables --- cl_dll/wscript | 1 - dlls/wscript | 1 - wscript | 6 ------ 3 files changed, 8 deletions(-) diff --git a/cl_dll/wscript b/cl_dll/wscript index 5fe926677..847004272 100644 --- a/cl_dll/wscript +++ b/cl_dll/wscript @@ -119,7 +119,6 @@ def build(bld): defines = defines, use = libs, install_path = install_path, - subsystem = bld.env.MSVC_SUBSYSTEM, idx = bld.get_taskgen_count() ) diff --git a/dlls/wscript b/dlls/wscript index 82d9e8703..58b07b2e8 100644 --- a/dlls/wscript +++ b/dlls/wscript @@ -54,7 +54,6 @@ def build(bld): includes = includes, defines = defines, install_path = install_path, - subsystem = bld.env.MSVC_SUBSYSTEM, idx = bld.get_taskgen_count() ) diff --git a/wscript b/wscript index 690d785c4..a934c6259 100644 --- a/wscript +++ b/wscript @@ -47,12 +47,6 @@ def configure(conf): conf.load('fwgslib reconfigure compiler_optimizations') conf.env.MSVC_TARGETS = ['x86' if not conf.options.ALLOW64 else 'x64'] - # Force XP compatibility, all build targets should add subsystem=bld.env.MSVC_SUBSYSTEM - if conf.env.MSVC_TARGETS[0] == 'x86': - conf.env.MSVC_SUBSYSTEM = 'WINDOWS,5.01' - else: - conf.env.MSVC_SUBSYSTEM = 'WINDOWS' - # Load compilers early conf.load('xcompile compiler_c compiler_cxx gccdeps') From 6be11c0fe07aa65b8c73c5ba228152536d990e67 Mon Sep 17 00:00:00 2001 From: Elinsrc <99191833+Elinsrc@users.noreply.github.com> Date: Sat, 30 Nov 2024 20:45:46 +0500 Subject: [PATCH 4/4] Client: fix draw menu (#490) Do not draw the old menu of the previous server when you connect to another server --- cl_dll/menu.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/cl_dll/menu.cpp b/cl_dll/menu.cpp index 3332a509b..5f732d9a9 100644 --- a/cl_dll/menu.cpp +++ b/cl_dll/menu.cpp @@ -51,6 +51,7 @@ void CHudMenu::InitHUDData( void ) { m_fMenuDisplayed = 0; m_bitsValidSlots = 0; + m_iFlags &= ~HUD_ACTIVE; Reset(); }