Merge branch 'master' into opfor

FWGS · Dec 7, 2024 · 7969e68 · 7969e68
2 parents 3bf4876 + 6be11c0
commit 7969e68
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 16 deletions.
diff --git 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
@@ -239,7 +239,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/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();
 }
 

diff --git a/cl_dll/wscript b/cl_dll/wscript
@@ -129,7 +129,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/CMakeLists.txt b/dlls/CMakeLists.txt
@@ -239,7 +239,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)

diff --git a/dlls/wscript b/dlls/wscript
@@ -55,7 +55,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
@@ -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')
 
@@ -41,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')