expvintl/source-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

waf: fix install

Browse Source
This commit is contained in:
nillerusr 2021-04-06 23:22:52 +03:00
parent f0c72952c8
commit 597f9da3b0
48 changed files with 36 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -6,3 +6,6 @@
lib/ lib/
*obj_* *obj_*
build/ build/
.waf*
.lock-waf*
__pycache__

3
appframework/wscript
View File

@ -36,8 +36,6 @@ def build(bld):
libs = [] libs = []
install_path = bld.env.PREFIX
bld.stlib( bld.stlib(
source = source, source = source,
target = PROJECT_NAME, target = PROJECT_NAME,
@ -46,7 +44,6 @@ def build(bld):
includes = includes, includes = includes,
defines = defines, defines = defines,
use = libs, use = libs,
install_path = install_path,
subsystem = bld.env.MSVC_SUBSYSTEM, subsystem = bld.env.MSVC_SUBSYSTEM,
idx = bld.get_taskgen_count() idx = bld.get_taskgen_count()
) )

3
bitmap/wscript
View File

@ -44,8 +44,6 @@ def build(bld):
libs = [] libs = []
install_path = bld.env.PREFIX
bld.stlib( bld.stlib(
source = source, source = source,
target = PROJECT_NAME, target = PROJECT_NAME,
@ -54,7 +52,6 @@ def build(bld):
includes = includes, includes = includes,
defines = defines, defines = defines,
use = libs, use = libs,
install_path = install_path,
subsystem = bld.env.MSVC_SUBSYSTEM, subsystem = bld.env.MSVC_SUBSYSTEM,
idx = bld.get_taskgen_count() idx = bld.get_taskgen_count()
) )

2
datacache/wscript
View File

@ -35,7 +35,7 @@ def build(bld):
libs = ['tier0','tier1','tier2','tier3'] libs = ['tier0','tier1','tier2','tier3']
install_path = bld.env.PREFIX install_path = bld.env.LIBDIR
bld.shlib( bld.shlib(
source = source, source = source,

3
datamodel/wscript
View File

@ -41,8 +41,6 @@ def build(bld):
libs = [] libs = []
install_path = bld.env.PREFIX
bld.stlib( bld.stlib(
source = source, source = source,
target = PROJECT_NAME, target = PROJECT_NAME,
@ -51,7 +49,6 @@ def build(bld):
includes = includes, includes = includes,
defines = defines, defines = defines,
use = libs, use = libs,
install_path = install_path,
subsystem = bld.env.MSVC_SUBSYSTEM, subsystem = bld.env.MSVC_SUBSYSTEM,
idx = bld.get_taskgen_count() idx = bld.get_taskgen_count()
) )

3
dmxloader/wscript
View File

@ -35,8 +35,6 @@ def build(bld):
libs = [] libs = []
install_path = bld.env.PREFIX
bld.stlib( bld.stlib(
source = source, source = source,
target = PROJECT_NAME, target = PROJECT_NAME,
@ -45,7 +43,6 @@ def build(bld):
includes = includes, includes = includes,
defines = defines, defines = defines,
use = libs, use = libs,
install_path = install_path,
subsystem = bld.env.MSVC_SUBSYSTEM, subsystem = bld.env.MSVC_SUBSYSTEM,
idx = bld.get_taskgen_count() idx = bld.get_taskgen_count()
) )

2
engine/voice_codecs/minimp3/wscript
View File

@ -30,7 +30,7 @@ def build(bld):
libs = ['tier0','tier1','vstdlib'] libs = ['tier0','tier1','vstdlib']
install_path = bld.env.PREFIX install_path = bld.env.LIBDIR
bld.shlib( bld.shlib(
source = source, source = source,

2
engine/wscript
View File

@ -329,7 +329,7 @@ def build(bld):
libs = ['tier0','vgui_controls','dmxloader','tier1','tier2','tier3','bitmap','vstdlib','appframework','datamodel','vtf','mathlib','steam_api','matsys_controls','BZIP2','SDL2','JPEG','ZLIB','OPENAL','CURL'] libs = ['tier0','vgui_controls','dmxloader','tier1','tier2','tier3','bitmap','vstdlib','appframework','datamodel','vtf','mathlib','steam_api','matsys_controls','BZIP2','SDL2','JPEG','ZLIB','OPENAL','CURL']
install_path = bld.env.PREFIX install_path = bld.env.LIBDIR
bld.shlib( bld.shlib(
source = source, source = source,

2
filesystem/wscript
View File

@ -44,7 +44,7 @@ def build(bld):
libs = ['tier0','tier1','tier2','vstdlib','vpklib'] libs = ['tier0','tier1','tier2','vstdlib','vpklib']
install_path = bld.env.PREFIX install_path = bld.env.LIBDIR
bld.shlib( bld.shlib(
source = source, source = source,

2
game/client/wscript
View File

@ -559,7 +559,7 @@ def build(bld):
'RT' 'RT'
] ]
install_path = bld.env.PREFIX install_path = bld.env.PREFIX+'/hl2/bin'
bld.shlib( bld.shlib(
source = source, source = source,

3
game/server/wscript
View File

@ -602,7 +602,7 @@ def build(bld):
libs = ['tier0','particles','dmxloader','tier1','tier2','tier3','mathlib','vstdlib','choreoobjects','steam_api'] libs = ['tier0','particles','dmxloader','tier1','tier2','tier3','mathlib','vstdlib','choreoobjects','steam_api']
install_path = bld.env.PREFIX install_path = bld.env.PREFIX+'/hl2/bin'
bld.shlib( bld.shlib(
source = source, source = source,
@ -611,6 +611,7 @@ def build(bld):
features = 'c cxx', features = 'c cxx',
includes = includes, includes = includes,
defines = defines, defines = defines,
install_path = install_path,
use = libs, use = libs,
subsystem = bld.env.MSVC_SUBSYSTEM, subsystem = bld.env.MSVC_SUBSYSTEM,
idx = bld.get_taskgen_count() idx = bld.get_taskgen_count()

2
gameui/wscript
View File

@ -109,7 +109,7 @@ def build(bld):
libs = ['tier0','vgui_controls','tier1','tier2','tier3','vstdlib','vtf','bitmap','mathlib','SDL2','steam_api','matsys_controls','JPEG','PNG'] libs = ['tier0','vgui_controls','tier1','tier2','tier3','vstdlib','vtf','bitmap','mathlib','SDL2','steam_api','matsys_controls','JPEG','PNG']
install_path = bld.env.PREFIX install_path = bld.env.LIBDIR
bld.shlib( bld.shlib(
source = source, source = source,

2
inputsystem/wscript
View File

@ -35,7 +35,7 @@ def build(bld):
libs = ['tier0','tier1','tier2','vstdlib','SDL2','steam_api'] libs = ['tier0','tier1','tier2','vstdlib','SDL2','steam_api']
install_path = bld.env.PREFIX install_path = bld.env.LIBDIR
bld.shlib( bld.shlib(
source = source, source = source,

2
ivp

@ -1 +1 @@
Subproject commit 72b80536ba0aceabc012224970488893c166a0a2 Subproject commit be91ef6413e2ff771c4484f7d5bd009d3bb90322

2
launcher/wscript
View File

@ -33,7 +33,7 @@ def build(bld):
libs = ['tier0','tier1','tier2','tier3','vstdlib','steam_api','appframework','SDL2','togl'] libs = ['tier0','tier1','tier2','tier3','vstdlib','steam_api','appframework','SDL2','togl']
install_path = bld.env.PREFIX install_path = bld.env.LIBDIR
bld.shlib( bld.shlib(
source = source, source = source,

4
launcher_main/wscript
View File

@ -5,7 +5,7 @@ from waflib import Utils
import os import os
top = '.' top = '.'
PROJECT_NAME = 'hl2' PROJECT_NAME = 'hl2_launcher'
def options(opt): def options(opt):
# stub # stub
@ -27,7 +27,7 @@ def build(bld):
libs += ['USER32', 'SHELL32'] libs += ['USER32', 'SHELL32']
source += ['launcher_main.rc'] source += ['launcher_main.rc']
install_path = bld.env.PREFIX install_path = bld.env.BINDIR
bld( bld(
source = source, source = source,
target = PROJECT_NAME, target = PROJECT_NAME,

2
materialsystem/shaderapidx9/wscript
View File

@ -58,7 +58,7 @@ def build(bld):
libs = ['tier0','tier1','tier2','vstdlib','togl','bitmap','mathlib'] libs = ['tier0','tier1','tier2','vstdlib','togl','bitmap','mathlib']
install_path = bld.env.PREFIX install_path = bld.env.LIBDIR
bld.shlib( bld.shlib(
source = source, source = source,

3
materialsystem/shaderlib/wscript
View File

@ -34,8 +34,6 @@ def build(bld):
libs = [] libs = []
install_path = bld.env.PREFIX
bld.stlib( bld.stlib(
source = source, source = source,
target = PROJECT_NAME, target = PROJECT_NAME,
@ -44,7 +42,6 @@ def build(bld):
includes = includes, includes = includes,
defines = defines, defines = defines,
use = libs, use = libs,
install_path = install_path,
subsystem = bld.env.MSVC_SUBSYSTEM, subsystem = bld.env.MSVC_SUBSYSTEM,
idx = bld.get_taskgen_count() idx = bld.get_taskgen_count()
) )

2
materialsystem/stdshaders/wscript
View File

@ -150,7 +150,7 @@ def build(bld):
libs = ['tier0','shaderlib','tier1','mathlib'] libs = ['tier0','shaderlib','tier1','mathlib']
install_path = bld.env.PREFIX install_path = bld.env.LIBDIR
bld.shlib( bld.shlib(
source = source, source = source,

2
materialsystem/wscript
View File

@ -60,7 +60,7 @@ def build(bld):
libs = ['tier0','tier1','tier2','vstdlib','mathlib','bitmap','shaderlib','vtf'] libs = ['tier0','tier1','tier2','vstdlib','mathlib','bitmap','shaderlib','vtf']
install_path = bld.env.PREFIX install_path = bld.env.LIBDIR
bld.shlib( bld.shlib(
source = source, source = source,

5
mathlib/wscript
View File

@ -1,4 +1,4 @@
#! /usr/bin/env python #! /usr/bin/env python
# encoding: utf-8 # encoding: utf-8
from waflib import Utils from waflib import Utils
@ -52,8 +52,6 @@ def build(bld):
libs = [] libs = []
install_path = bld.env.PREFIX
bld.stlib( bld.stlib(
source = source, source = source,
target = PROJECT_NAME, target = PROJECT_NAME,
@ -62,7 +60,6 @@ def build(bld):
includes = includes, includes = includes,
defines = defines, defines = defines,
use = libs, use = libs,
install_path = install_path,
subsystem = bld.env.MSVC_SUBSYSTEM, subsystem = bld.env.MSVC_SUBSYSTEM,
idx = bld.get_taskgen_count() idx = bld.get_taskgen_count()
) )

2
scenefilecache/wscript
View File

@ -32,7 +32,7 @@ def build(bld):
libs = ['tier0','tier1'] libs = ['tier0','tier1']
install_path = bld.env.PREFIX install_path = bld.env.LIBDIR
bld.shlib( bld.shlib(
source = source, source = source,

BIN
scripts/waifulib/__pycache__/compiler_optimizations.cpython-39.pyc
View File

Binary file not shown.

BIN
scripts/waifulib/__pycache__/enforce_pic.cpython-39.pyc
View File

Binary file not shown.

BIN
scripts/waifulib/__pycache__/xcompile.cpython-38.pyc
View File

Binary file not shown.

BIN
scripts/waifulib/__pycache__/xcompile.cpython-39.pyc
View File

Binary file not shown.

BIN
scripts/waifulib/__pycache__/xshlib.cpython-38.pyc
View File

Binary file not shown.

BIN
scripts/waifulib/__pycache__/xshlib.cpython-39.pyc
View File

Binary file not shown.

2
serverbrowser/wscript
View File

@ -55,7 +55,7 @@ def build(bld):
libs = ['tier0','vgui_controls','mathlib','tier1','tier2','tier3','vstdlib','steam_api'] libs = ['tier0','vgui_controls','mathlib','tier1','tier2','tier3','vstdlib','steam_api']
install_path = bld.env.PREFIX install_path = bld.env.LIBDIR
bld.shlib( bld.shlib(
source = source, source = source,

2
soundemittersystem/wscript
View File

@ -36,7 +36,7 @@ def build(bld):
libs = ['tier0','tier1','vstdlib'] libs = ['tier0','tier1','vstdlib']
install_path = bld.env.PREFIX install_path = bld.env.LIBDIR
bld.shlib( bld.shlib(
source = source, source = source,

2
studiorender/wscript
View File

@ -43,7 +43,7 @@ def build(bld):
libs = ['tier0','tier1','tier2','tier3','vstdlib','mathlib','bitmap'] libs = ['tier0','tier1','tier2','tier3','vstdlib','mathlib','bitmap']
install_path = bld.env.PREFIX install_path = bld.env.LIBDIR
bld.shlib( bld.shlib(
source = source, source = source,

2
thirdparty

@ -1 +1 @@
Subproject commit 31ae58f64f9169db7f4e02c83dba46e5a47e0c7b Subproject commit ecce0cecc39b32bdf704542e3cb870ba4e2e8e42

2
tier0/wscript
View File

@ -67,7 +67,7 @@ def build(bld):
libs = ['DL'] libs = ['DL']
install_path = bld.env.PREFIX install_path = bld.env.LIBDIR
bld.shlib( bld.shlib(
source = source, source = source,

2
tier1/wscript
View File

@ -75,8 +75,6 @@ def build(bld):
libs = [] libs = []
install_path = bld.env.PREFIX
bld.stlib( bld.stlib(
source = source, source = source,
target = PROJECT_NAME, target = PROJECT_NAME,

3
tier2/wscript
View File

@ -49,8 +49,6 @@ def build(bld):
libs = [] libs = []
install_path = bld.env.PREFIX
bld.stlib( bld.stlib(
source = source, source = source,
target = PROJECT_NAME, target = PROJECT_NAME,
@ -59,7 +57,6 @@ def build(bld):
includes = includes, includes = includes,
defines = defines, defines = defines,
use = libs, use = libs,
install_path = install_path,
subsystem = bld.env.MSVC_SUBSYSTEM, subsystem = bld.env.MSVC_SUBSYSTEM,
idx = bld.get_taskgen_count() idx = bld.get_taskgen_count()
) )

3
tier3/wscript
View File

@ -37,8 +37,6 @@ def build(bld):
libs = [] libs = []
install_path = bld.env.PREFIX
bld.stlib( bld.stlib(
source = source, source = source,
target = PROJECT_NAME, target = PROJECT_NAME,
@ -47,7 +45,6 @@ def build(bld):
includes = includes, includes = includes,
defines = defines, defines = defines,
use = libs, use = libs,
install_path = install_path,
subsystem = bld.env.MSVC_SUBSYSTEM, subsystem = bld.env.MSVC_SUBSYSTEM,
idx = bld.get_taskgen_count() idx = bld.get_taskgen_count()
) )

2
togl/wscript
View File

@ -46,7 +46,7 @@ def build(bld):
libs = ['tier0','tier1','tier2','vstdlib','mathlib'] libs = ['tier0','tier1','tier2','vstdlib','mathlib']
install_path = bld.env.PREFIX install_path = bld.env.LIBDIR
bld.shlib( bld.shlib(
source = source, source = source,

3
vgui2/matsys_controls/wscript
View File

@ -50,8 +50,6 @@ def build(bld):
libs = [] libs = []
install_path = bld.env.PREFIX
bld.stlib( bld.stlib(
source = source, source = source,
target = PROJECT_NAME, target = PROJECT_NAME,
@ -60,7 +58,6 @@ def build(bld):
includes = includes, includes = includes,
defines = defines, defines = defines,
use = libs, use = libs,
install_path = install_path,
subsystem = bld.env.MSVC_SUBSYSTEM, subsystem = bld.env.MSVC_SUBSYSTEM,
idx = bld.get_taskgen_count() idx = bld.get_taskgen_count()
) )

2
vgui2/src/wscript
View File

@ -52,7 +52,7 @@ def build(bld):
libs = ['tier0','tier1','tier2','tier3','vstdlib','SDL2'] libs = ['tier0','tier1','tier2','tier3','vstdlib','SDL2']
install_path = bld.env.PREFIX install_path = bld.env.LIBDIR
bld.shlib( bld.shlib(
source = source, source = source,

3
vgui2/vgui_controls/wscript
View File

@ -106,8 +106,6 @@ def build(bld):
libs = [] libs = []
install_path = bld.env.PREFIX
bld.stlib( bld.stlib(
source = source, source = source,
target = PROJECT_NAME, target = PROJECT_NAME,
@ -116,7 +114,6 @@ def build(bld):
includes = includes, includes = includes,
defines = defines, defines = defines,
use = libs, use = libs,
install_path = install_path,
subsystem = bld.env.MSVC_SUBSYSTEM, subsystem = bld.env.MSVC_SUBSYSTEM,
idx = bld.get_taskgen_count() idx = bld.get_taskgen_count()
) )

3
vgui2/vgui_surfacelib/wscript
View File

@ -38,8 +38,6 @@ def build(bld):
libs = [] libs = []
install_path = bld.env.PREFIX
bld.stlib( bld.stlib(
source = source, source = source,
target = PROJECT_NAME, target = PROJECT_NAME,
@ -48,7 +46,6 @@ def build(bld):
includes = includes, includes = includes,
defines = defines, defines = defines,
use = libs, use = libs,
install_path = install_path,
subsystem = bld.env.MSVC_SUBSYSTEM, subsystem = bld.env.MSVC_SUBSYSTEM,
idx = bld.get_taskgen_count() idx = bld.get_taskgen_count()
) )

2
vguimatsurface/wscript
View File

@ -45,7 +45,7 @@ def build(bld):
libs = ['bitmap','mathlib','tier0','vgui_controls','tier1','vstdlib','tier2','tier3','vgui_surfacelib','FT2','FC','SDL2'] libs = ['bitmap','mathlib','tier0','vgui_controls','tier1','vstdlib','tier2','tier3','vgui_surfacelib','FT2','FC','SDL2']
install_path = bld.env.PREFIX install_path = bld.env.LIBDIR
bld.shlib( bld.shlib(
source = source, source = source,

2
video/wscript
View File

@ -31,7 +31,7 @@ def build(bld):
libs = ['tier0','tier1','tier2','tier3','vstdlib'] libs = ['tier0','tier1','tier2','tier3','vstdlib']
install_path = bld.env.PREFIX install_path = bld.env.LIBDIR
bld.shlib( bld.shlib(
source = source, source = source,

2
vphysics/wscript
View File

@ -63,7 +63,7 @@ def build(bld):
libs = ['tier0','havana_constraints','hk_math','hk_base','ivp_compactbuilder','ivp_physics','tier1','tier2','vstdlib','mathlib'] libs = ['tier0','havana_constraints','hk_math','hk_base','ivp_compactbuilder','ivp_physics','tier1','tier2','vstdlib','mathlib']
install_path = bld.env.PREFIX install_path = bld.env.LIBDIR
bld.shlib( bld.shlib(
source = source, source = source,

3
vpklib/wscript
View File

@ -32,8 +32,6 @@ def build(bld):
libs = [] libs = []
install_path = bld.env.PREFIX
bld.stlib( bld.stlib(
source = source, source = source,
target = PROJECT_NAME, target = PROJECT_NAME,
@ -42,7 +40,6 @@ def build(bld):
includes = includes, includes = includes,
defines = defines, defines = defines,
use = libs, use = libs,
install_path = install_path,
subsystem = bld.env.MSVC_SUBSYSTEM, subsystem = bld.env.MSVC_SUBSYSTEM,
idx = bld.get_taskgen_count() idx = bld.get_taskgen_count()
) )

2
vstdlib/wscript
View File

@ -40,7 +40,7 @@ def build(bld):
libs = ['tier0','tier1'] libs = ['tier0','tier1']
install_path = bld.env.PREFIX install_path = bld.env.LIBDIR
bld.shlib( bld.shlib(
source = source, source = source,

3
vtf/wscript
View File

@ -34,8 +34,6 @@ def build(bld):
libs = [] libs = []
install_path = bld.env.PREFIX
bld.stlib( bld.stlib(
source = source, source = source,
target = PROJECT_NAME, target = PROJECT_NAME,
@ -44,7 +42,6 @@ def build(bld):
includes = includes, includes = includes,
defines = defines, defines = defines,
use = libs, use = libs,
install_path = install_path,
subsystem = bld.env.MSVC_SUBSYSTEM, subsystem = bld.env.MSVC_SUBSYSTEM,
idx = bld.get_taskgen_count() idx = bld.get_taskgen_count()
) )

8
wscript
View File

@ -1,6 +1,6 @@
#! /usr/bin/env python #! /usr/bin/env python
# encoding: utf-8 # encoding: utf-8
# a1batross, mittorn, 2018 # a1batross, mittorn, nillerusr
from __future__ import print_function from __future__ import print_function
from waflib import Logs, Context, Configure from waflib import Logs, Context, Configure
@ -104,8 +104,6 @@ def options(opt):
opt.load('reconfigure') opt.load('reconfigure')
def configure(conf): def configure(conf):
conf.env.PREFIX = '.'
conf.load('fwgslib reconfigure') conf.load('fwgslib reconfigure')
# Force XP compability, all build targets should add # Force XP compability, all build targets should add
@ -219,8 +217,8 @@ def configure(conf):
if conf.env.DEST_OS != 'android': if conf.env.DEST_OS != 'android':
conf.env.LIBDIR = conf.env.PREFIX+'/bin/' conf.env.LIBDIR = conf.env.PREFIX+'/bin/'
conf.env.BINDIR = conf.env.PREFIX conf.env.BINDIR = conf.env.PREFIX
else:
conf.env.LIBDIR = conf.env.BINDIR = conf.env.PREFIX conf.env.LIBDIR = conf.env.BINDIR = conf.env.PREFIX
define_platform(conf) define_platform(conf)
conf.add_subproject(projects) conf.add_subproject(projects)