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

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

View File

@ -89,7 +89,8 @@ def build(bld):
if bld.env.DEST_OS == 'linux':
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:
bld(

View File

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

View File

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