YGGverse/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/YGGverse/xash3d-fwgs.git synced 2025-01-23 05:14:15 +00:00
Code Issues Projects Releases Wiki Activity

wscript: remove libm linking to static public, it's useless. Correct include path order

Browse Source
This commit is contained in:
Alibek Omarov 2019-03-20 02:40:47 +03:00
parent 4880ca3ca2
commit f3a2f46fb3
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engine/wscript
View File

@ -89,7 +89,8 @@ def build(bld):
if bld.env.DEST_OS == 'linux': if bld.env.DEST_OS == 'linux':
libs.append('RT') libs.append('RT')
includes = ['common', 'server', 'client', 'client/vgui', '.', '../common', '../public', '../pm_shared' ] # HACK: public headers must be put before common, so we don't get wrong mathlib included
includes = ['common', 'server', 'client', 'client/vgui', '.', '../public', '../common', '../pm_shared' ]
if bld.env.SINGLE_BINARY: if bld.env.SINGLE_BINARY:
bld( bld(

4
public/wscript
View File

@ -21,10 +21,8 @@ def build(bld):
name = get_subproject_name(bld) name = get_subproject_name(bld)
bld.env = bld.all_envs[name] bld.env = bld.all_envs[name]
libs = [ 'M' ]
source = bld.path.ant_glob(['*.c']) source = bld.path.ant_glob(['*.c'])
libs = []
includes = [ '.', '../common', '../engine' ] includes = [ '.', '../common', '../engine' ]
bld.stlib( bld.stlib(

4
ref_gl/wscript
View File

@ -30,7 +30,7 @@ def build(bld):
name = get_subproject_name(bld) name = get_subproject_name(bld)
bld.env = bld.all_envs[name] bld.env = bld.all_envs[name]
libs = [ 'M', 'public' ] libs = [ 'public', 'm' ]
source = bld.path.ant_glob(['*.c']) source = bld.path.ant_glob(['*.c'])
@ -39,8 +39,8 @@ def build(bld):
'../engine/common', '../engine/common',
'../engine/server', '../engine/server',
'../engine/client', '../engine/client',
'../common',
'../public', '../public',
'../common',
'../pm_shared' ] '../pm_shared' ]
bld.shlib( bld.shlib(