From 56485c5f056015f59e0930e4bf6bd777f078504c Mon Sep 17 00:00:00 2001
From: Er2 <er2@dismail.de>
Date: Sun, 14 May 2023 16:52:26 +0300
Subject: [PATCH] some fixes

---
 .github/workflows/build.yml         |  4 +++-
 appframework/glmrendererinfo_osx.mm |  2 +-
 serverbrowser/wscript               |  2 +-
 tier0/wscript                       |  6 ++++++
 utils/vrad/wscript                  |  3 ---
 wscript                             | 14 ++++++++------
 6 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c8703320..80e682db 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,7 +2,7 @@ name: Build
 
 on: [push, pull_request]
 env:
-  WAF_FLAGS: -T debug --no-warns --prefix=build_hl2
+  WAF_FLAGS: -T release --no-warns --prefix=build_hl2
 
 jobs:
   build-linux:
@@ -66,6 +66,7 @@ jobs:
 
   build-macos:
     strategy:
+      fail-fast: false
       matrix:
         flags: ['', '-dl', '-u']
 
@@ -93,6 +94,7 @@ jobs:
 
   build-windows:
     strategy:
+      fail-fast: false
       matrix:
         os: [windows-2019]
         bits: ['', '--64bits']
diff --git a/appframework/glmrendererinfo_osx.mm b/appframework/glmrendererinfo_osx.mm
index a36f6249..c5164871 100644
--- a/appframework/glmrendererinfo_osx.mm
+++ b/appframework/glmrendererinfo_osx.mm
@@ -24,7 +24,7 @@
 #include "tier1/utllinkedlist.h"
 #include "togl/rendermechanism.h"
 #include "appframework/ilaunchermgr.h"	// gets pulled in from glmgr.h
-#include "appframework/iappsystemgroup.h"
+#include "appframework/IAppSystemGroup.h"
 #include "inputsystem/ButtonCode.h"
 
 
diff --git a/serverbrowser/wscript b/serverbrowser/wscript
index abeb6297..22e792b4 100755
--- a/serverbrowser/wscript
+++ b/serverbrowser/wscript
@@ -5,7 +5,7 @@ from waflib import Utils
 import os
 
 top = '.'
-PROJECT_NAME = 'ServerBrowser'
+PROJECT_NAME = 'serverbrowser'
 
 def options(opt):
 	# stub
diff --git a/tier0/wscript b/tier0/wscript
index 7604b74b..d1301a83 100755
--- a/tier0/wscript
+++ b/tier0/wscript
@@ -19,6 +19,9 @@ def configure(conf):
 	conf.define('GIT_COMMIT_HASH', conf.env.GIT_VERSION)
 	conf.define('REL_VERSION', conf.env.REL_VERSION)
 
+	if conf.env.DEST_OS == 'freebsd':
+		conf.check_cc(lib='execinfo')
+
 def build(bld):
 	source = [
 		'assert_dialog.cpp',
@@ -85,6 +88,9 @@ def build(bld):
 	else:
 		libs = ['DL', 'M', 'LOG']
 
+	if bld.env.DEST_OS == 'freebsd':
+		libs += ['EXECINFO']
+
 	install_path = bld.env.LIBDIR
 
 	bld.shlib(
diff --git a/utils/vrad/wscript b/utils/vrad/wscript
index 7b6779a5..e0b56780 100755
--- a/utils/vrad/wscript
+++ b/utils/vrad/wscript
@@ -14,9 +14,6 @@ def options(opt):
 
 def configure(conf):
 	conf.define('VRAD', 1)
-	conf.define('MAX_TOOL_THREADS', 1)
-	conf.define('THREADINDEX_MAIN', 0)
-	conf.define('NO_THREAD_NAMES', 1)
 	return
 
 def build(bld):
diff --git a/wscript b/wscript
index bb2fdf02..88aea3d9 100644
--- a/wscript
+++ b/wscript
@@ -123,7 +123,7 @@ projects={
 		'fgdlib',
 		'raytrace',
 		'vphysics',
-		'movieobjects',
+#		'movieobjects',
 #		'hammer_launcher',
 		'ivp/havana',
 		'ivp/havana/havok/hk_base',
@@ -494,12 +494,14 @@ def configure(conf):
 		flags += ['-fsanitize=%s'%conf.options.SANITIZE, '-fno-sanitize=vptr']
 
 	if conf.env.DEST_OS != 'win32':
-		flags += ['-pipe', '-fPIC', '-L'+os.path.abspath('.')+'/lib/'+conf.env.DEST_OS+'/'+conf.env.DEST_CPU+'/']
+		flags += ['-pipe', '-fPIC']
+		conf.env.RPATH = ['$ORIGIN']
 	if conf.env.COMPILER_CC != 'msvc':
 		flags += ['-pthread']
 
 	if conf.env.DEST_OS == 'android':
 		flags += [
+			'-L'+os.path.abspath('.')+'/lib/android/'+conf.env.DEST_CPU+'/',
 			'-I'+os.path.abspath('.')+'/thirdparty/curl/include',
 			'-I'+os.path.abspath('.')+'/thirdparty/SDL',
 			'-I'+os.path.abspath('.')+'/thirdparty/openal-soft/include/',
@@ -510,7 +512,10 @@ def configure(conf):
 		]
 
 		flags += ['-funwind-tables', '-g']
-	elif conf.env.COMPILER_CC != 'msvc' and conf.env.DEST_OS != 'darwin' and conf.env.DEST_CPU in ['x86', 'x86_64']:
+	elif conf.env.DEST_OS == 'win32':
+		flags += ['-L'+os.path.abspath('.')+'/lib/win32/'+conf.env.DEST_CPU+'/']
+
+	if conf.env.COMPILER_CC != 'msvc' and conf.env.DEST_OS != 'darwin' and conf.env.DEST_CPU in ['x86', 'x86_64']:
 		flags += ['-march=core2']
 
 	if conf.env.DEST_CPU in ['x86', 'x86_64']:
@@ -521,9 +526,6 @@ def configure(conf):
 	if conf.env.DEST_CPU == 'arm':
 		flags += ['-mfpu=neon-vfpv4']
 
-	if conf.env.DEST_OS == 'freebsd':
-		linkflags += ['-lexecinfo']
-
 	if conf.env.DEST_OS != 'win32':
 		cflags += flags
 		linkflags += flags