Browse Source

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

pull/2/head
Alibek Omarov 6 years ago
parent
commit
f3a2f46fb3
  1. 3
      engine/wscript
  2. 4
      public/wscript
  3. 4
      ref_gl/wscript

3
engine/wscript

@ -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

@ -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

@ -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(

Loading…
Cancel
Save