d4708/source-engine
1
0
Fork 0
mirror of https://github.com/nillerusr/source-engine.git synced 2025-01-12 08:08:06 +00:00
Code Issues Projects Releases Wiki Activity

some fixes

Browse Source
This commit is contained in:
Er2 2023-05-14 16:52:26 +03:00
parent 6d8b1917d2
commit 56485c5f05
6 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build.yml vendored
View File

@ -2,7 +2,7 @@ name: Build
on: [push, pull_request] on: [push, pull_request]
env: env:
WAF_FLAGS: -T debug --no-warns --prefix=build_hl2 WAF_FLAGS: -T release --no-warns --prefix=build_hl2
jobs: jobs:
build-linux: build-linux:
@ -66,6 +66,7 @@ jobs:
build-macos: build-macos:
strategy: strategy:
fail-fast: false
matrix: matrix:
flags: ['', '-dl', '-u'] flags: ['', '-dl', '-u']
@ -93,6 +94,7 @@ jobs:
build-windows: build-windows:
strategy: strategy:
fail-fast: false
matrix: matrix:
os: [windows-2019] os: [windows-2019]
bits: ['', '--64bits'] bits: ['', '--64bits']

2
appframework/glmrendererinfo_osx.mm
View File

@ -24,7 +24,7 @@
#include "tier1/utllinkedlist.h" #include "tier1/utllinkedlist.h"
#include "togl/rendermechanism.h" #include "togl/rendermechanism.h"
#include "appframework/ilaunchermgr.h" // gets pulled in from glmgr.h #include "appframework/ilaunchermgr.h" // gets pulled in from glmgr.h
#include "appframework/iappsystemgroup.h" #include "appframework/IAppSystemGroup.h"
#include "inputsystem/ButtonCode.h" #include "inputsystem/ButtonCode.h"

2
serverbrowser/wscript
View File

@ -5,7 +5,7 @@ from waflib import Utils
import os import os
top = '.' top = '.'
PROJECT_NAME = 'ServerBrowser' PROJECT_NAME = 'serverbrowser'
def options(opt): def options(opt):
# stub # stub

6
tier0/wscript
View File

@ -19,6 +19,9 @@ def configure(conf):
conf.define('GIT_COMMIT_HASH', conf.env.GIT_VERSION) conf.define('GIT_COMMIT_HASH', conf.env.GIT_VERSION)
conf.define('REL_VERSION', conf.env.REL_VERSION) conf.define('REL_VERSION', conf.env.REL_VERSION)
if conf.env.DEST_OS == 'freebsd':
conf.check_cc(lib='execinfo')
def build(bld): def build(bld):
source = [ source = [
'assert_dialog.cpp', 'assert_dialog.cpp',
@ -85,6 +88,9 @@ def build(bld):
else: else:
libs = ['DL', 'M', 'LOG'] libs = ['DL', 'M', 'LOG']
if bld.env.DEST_OS == 'freebsd':
libs += ['EXECINFO']
install_path = bld.env.LIBDIR install_path = bld.env.LIBDIR
bld.shlib( bld.shlib(

3
utils/vrad/wscript
View File

@ -14,9 +14,6 @@ def options(opt):
def configure(conf): def configure(conf):
conf.define('VRAD', 1) conf.define('VRAD', 1)
conf.define('MAX_TOOL_THREADS', 1)
conf.define('THREADINDEX_MAIN', 0)
conf.define('NO_THREAD_NAMES', 1)
return return
def build(bld): def build(bld):

14
wscript
View File

@ -123,7 +123,7 @@ projects={
'fgdlib', 'fgdlib',
'raytrace', 'raytrace',
'vphysics', 'vphysics',
'movieobjects', # 'movieobjects',
# 'hammer_launcher', # 'hammer_launcher',
'ivp/havana', 'ivp/havana',
'ivp/havana/havok/hk_base', 'ivp/havana/havok/hk_base',
@ -494,12 +494,14 @@ def configure(conf):
flags += ['-fsanitize=%s'%conf.options.SANITIZE, '-fno-sanitize=vptr'] flags += ['-fsanitize=%s'%conf.options.SANITIZE, '-fno-sanitize=vptr']
if conf.env.DEST_OS != 'win32': 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': if conf.env.COMPILER_CC != 'msvc':
flags += ['-pthread'] flags += ['-pthread']
if conf.env.DEST_OS == 'android': if conf.env.DEST_OS == 'android':
flags += [ flags += [
'-L'+os.path.abspath('.')+'/lib/android/'+conf.env.DEST_CPU+'/',
'-I'+os.path.abspath('.')+'/thirdparty/curl/include', '-I'+os.path.abspath('.')+'/thirdparty/curl/include',
'-I'+os.path.abspath('.')+'/thirdparty/SDL', '-I'+os.path.abspath('.')+'/thirdparty/SDL',
'-I'+os.path.abspath('.')+'/thirdparty/openal-soft/include/', '-I'+os.path.abspath('.')+'/thirdparty/openal-soft/include/',
@ -510,7 +512,10 @@ def configure(conf):
] ]
flags += ['-funwind-tables', '-g'] 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'] flags += ['-march=core2']
if conf.env.DEST_CPU in ['x86', 'x86_64']: if conf.env.DEST_CPU in ['x86', 'x86_64']:
@ -521,9 +526,6 @@ def configure(conf):
if conf.env.DEST_CPU == 'arm': if conf.env.DEST_CPU == 'arm':
flags += ['-mfpu=neon-vfpv4'] flags += ['-mfpu=neon-vfpv4']
if conf.env.DEST_OS == 'freebsd':
linkflags += ['-lexecinfo']
if conf.env.DEST_OS != 'win32': if conf.env.DEST_OS != 'win32':
cflags += flags cflags += flags
linkflags += flags linkflags += flags