mirror of
https://github.com/nillerusr/source-engine.git
synced 2025-04-20 01:47:19 +00:00
Merge 426d6a329f
into 29985681a1
This commit is contained in:
commit
0b241d1109
@ -17,6 +17,8 @@ def configure(conf):
|
|||||||
conf.define('TIER0_DLL_EXPORT',1)
|
conf.define('TIER0_DLL_EXPORT',1)
|
||||||
# conf.define('NO_HOOK_MALLOC',1)
|
# conf.define('NO_HOOK_MALLOC',1)
|
||||||
|
|
||||||
|
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',
|
||||||
@ -82,6 +84,7 @@ def build(bld):
|
|||||||
libs = ['ADVAPI32', 'WS2_32']
|
libs = ['ADVAPI32', 'WS2_32']
|
||||||
else:
|
else:
|
||||||
libs = ['DL', 'M', 'LOG']
|
libs = ['DL', 'M', 'LOG']
|
||||||
|
if bld.env.DEST_OS == 'freebsd': libs += ['EXECINFO']
|
||||||
|
|
||||||
install_path = None if bld.env.BUILD_SDK else bld.env.LIBDIR
|
install_path = None if bld.env.BUILD_SDK else bld.env.LIBDIR
|
||||||
|
|
||||||
|
1
wscript
1
wscript
@ -625,6 +625,7 @@ def configure(conf):
|
|||||||
conf.add_subproject(projects['game'])
|
conf.add_subproject(projects['game'])
|
||||||
|
|
||||||
def build(bld):
|
def build(bld):
|
||||||
|
if not os.environ.get('CCACHE_DIR'):
|
||||||
os.environ["CCACHE_DIR"] = os.path.abspath('.ccache/'+bld.env.COMPILER_CC+'/'+bld.env.DEST_OS+'/'+bld.env.DEST_CPU)
|
os.environ["CCACHE_DIR"] = os.path.abspath('.ccache/'+bld.env.COMPILER_CC+'/'+bld.env.DEST_OS+'/'+bld.env.DEST_CPU)
|
||||||
|
|
||||||
if bld.env.DEST_OS in ['win32', 'android']:
|
if bld.env.DEST_OS in ['win32', 'android']:
|
||||||
|
Loading…
Reference in New Issue
Block a user