mirror of
https://github.com/FWGS/xash3d-fwgs
synced 2024-11-22 18:07:09 +01:00
wscript: remove libm linking to static public, it's useless. Correct include path order
This commit is contained in:
parent
4880ca3ca2
commit
f3a2f46fb3
@ -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(
|
||||
|
@ -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(
|
||||
|
@ -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(
|
||||
|
Loading…
Reference in New Issue
Block a user