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

wscript: move build env setup to main wscript

Browse Source
This commit is contained in:
Alibek Omarov 2019-03-25 01:25:44 +03:00
parent 70abee3e28
commit 17f719558c
7 changed files with 5 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engine/wscript
View File

@ -4,7 +4,6 @@
from waflib import Logs
import os
from fwgslib import get_subproject_name
top = '.'
@ -49,9 +48,6 @@ def configure(conf):
conf.env.append_unique('DEFINES', 'DBGHELP')
def build(bld):
bld.load_envs()
bld.env = bld.all_envs[get_subproject_name(bld)]
libs = [ 'public' ]
source = bld.path.ant_glob([
'common/*.c',

4
game_launch/wscript
View File

@ -5,7 +5,6 @@
from waflib import Logs
import os
import sys
from fwgslib import get_subproject_name
top = '.'
@ -17,9 +16,6 @@ def configure(conf):
conf.load('winres')
def build(bld):
bld.load_envs()
bld.env = bld.all_envs[get_subproject_name(bld)]
source = ['game.cpp']
includes = '. ../common'
libs = []

2
mainui

@ -1 +1 @@
Subproject commit f2a54fcb5465d4e3902004228918586aa54e5f47
Subproject commit cfa77685072cb5b6789de185b4512d654584d8e1

6
public/wscript
View File

@ -17,17 +17,13 @@ def configure(conf):
return
def build(bld):
bld.load_envs()
name = get_subproject_name(bld)
bld.env = bld.all_envs[name]
source = bld.path.ant_glob(['*.c'])
libs = []
includes = [ '.', '../common', '../engine' ]
bld.stlib(
source = source,
target = name,
target = 'public',
features = 'c',
includes = includes,
use = libs,

9
ref_gl/wscript
View File

@ -23,13 +23,6 @@ def configure(conf):
conf.env.append_unique('DEFINES', 'REF_DLL')
def build(bld):
if bld.env.DEDICATED:
return
bld.load_envs()
name = get_subproject_name(bld)
bld.env = bld.all_envs[name]
libs = [ 'public', 'M' ]
source = bld.path.ant_glob(['*.c'])
@ -45,7 +38,7 @@ def build(bld):
bld.shlib(
source = source,
target = name,
target = 'ref_gl',
features = 'c',
includes = includes,
use = libs,

4
vgui_support/wscript
View File

@ -4,7 +4,6 @@
from waflib import Logs
import os
from fwgslib import get_subproject_name
top = '.'
@ -74,9 +73,6 @@ def configure(conf):
conf.fatal("Can't compile simple program. Check your path to vgui-dev repository.")
def build(bld):
bld.load_envs()
bld.env = bld.all_envs[get_subproject_name(bld)]
if bld.env.NO_VGUI:
return

2
wscript
View File

@ -198,6 +198,7 @@ def configure(conf):
conf.setenv('')
def build(bld):
bld.load_envs()
for i in SUBDIRS:
if bld.env.SINGLE_BINARY and i.singlebin:
continue
@ -208,4 +209,5 @@ def build(bld):
if i.ignore:
continue
bld.env = bld.all_envs[i.name]
bld.recurse(i.name)