diff --git a/.gitignore b/.gitignore index e483e125..41099b16 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,6 @@ lib/ *obj_* build/ +.waf* +.lock-waf* +__pycache__ diff --git a/appframework/wscript b/appframework/wscript index 26b2aa2a..d5126d96 100755 --- a/appframework/wscript +++ b/appframework/wscript @@ -36,8 +36,6 @@ def build(bld): libs = [] - install_path = bld.env.PREFIX - bld.stlib( source = source, target = PROJECT_NAME, @@ -46,7 +44,6 @@ def build(bld): includes = includes, defines = defines, use = libs, - install_path = install_path, subsystem = bld.env.MSVC_SUBSYSTEM, idx = bld.get_taskgen_count() ) diff --git a/bitmap/wscript b/bitmap/wscript index 83a358b1..dae3a16f 100755 --- a/bitmap/wscript +++ b/bitmap/wscript @@ -44,8 +44,6 @@ def build(bld): libs = [] - install_path = bld.env.PREFIX - bld.stlib( source = source, target = PROJECT_NAME, @@ -54,7 +52,6 @@ def build(bld): includes = includes, defines = defines, use = libs, - install_path = install_path, subsystem = bld.env.MSVC_SUBSYSTEM, idx = bld.get_taskgen_count() ) diff --git a/datacache/wscript b/datacache/wscript index 820f4d96..81bd128f 100755 --- a/datacache/wscript +++ b/datacache/wscript @@ -35,7 +35,7 @@ def build(bld): libs = ['tier0','tier1','tier2','tier3'] - install_path = bld.env.PREFIX + install_path = bld.env.LIBDIR bld.shlib( source = source, diff --git a/datamodel/wscript b/datamodel/wscript index bd843d62..9ebce224 100755 --- a/datamodel/wscript +++ b/datamodel/wscript @@ -41,8 +41,6 @@ def build(bld): libs = [] - install_path = bld.env.PREFIX - bld.stlib( source = source, target = PROJECT_NAME, @@ -51,7 +49,6 @@ def build(bld): includes = includes, defines = defines, use = libs, - install_path = install_path, subsystem = bld.env.MSVC_SUBSYSTEM, idx = bld.get_taskgen_count() ) diff --git a/dmxloader/wscript b/dmxloader/wscript index 9da0a98d..3413b0df 100755 --- a/dmxloader/wscript +++ b/dmxloader/wscript @@ -35,8 +35,6 @@ def build(bld): libs = [] - install_path = bld.env.PREFIX - bld.stlib( source = source, target = PROJECT_NAME, @@ -45,7 +43,6 @@ def build(bld): includes = includes, defines = defines, use = libs, - install_path = install_path, subsystem = bld.env.MSVC_SUBSYSTEM, idx = bld.get_taskgen_count() ) diff --git a/engine/voice_codecs/minimp3/wscript b/engine/voice_codecs/minimp3/wscript index 722693a7..b3f0743c 100755 --- a/engine/voice_codecs/minimp3/wscript +++ b/engine/voice_codecs/minimp3/wscript @@ -30,7 +30,7 @@ def build(bld): libs = ['tier0','tier1','vstdlib'] - install_path = bld.env.PREFIX + install_path = bld.env.LIBDIR bld.shlib( source = source, diff --git a/engine/wscript b/engine/wscript index 7c2a286d..ce4dc481 100755 --- a/engine/wscript +++ b/engine/wscript @@ -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'] - install_path = bld.env.PREFIX + install_path = bld.env.LIBDIR bld.shlib( source = source, diff --git a/filesystem/wscript b/filesystem/wscript index ceadcdb8..adfdd372 100755 --- a/filesystem/wscript +++ b/filesystem/wscript @@ -44,7 +44,7 @@ def build(bld): libs = ['tier0','tier1','tier2','vstdlib','vpklib'] - install_path = bld.env.PREFIX + install_path = bld.env.LIBDIR bld.shlib( source = source, diff --git a/game/client/wscript b/game/client/wscript index 24a26677..b4f81d2f 100755 --- a/game/client/wscript +++ b/game/client/wscript @@ -559,7 +559,7 @@ def build(bld): 'RT' ] - install_path = bld.env.PREFIX + install_path = bld.env.PREFIX+'/hl2/bin' bld.shlib( source = source, diff --git a/game/server/wscript b/game/server/wscript index 52721b72..f22a0a42 100755 --- a/game/server/wscript +++ b/game/server/wscript @@ -602,7 +602,7 @@ def build(bld): 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( source = source, @@ -611,6 +611,7 @@ def build(bld): features = 'c cxx', includes = includes, defines = defines, + install_path = install_path, use = libs, subsystem = bld.env.MSVC_SUBSYSTEM, idx = bld.get_taskgen_count() diff --git a/gameui/wscript b/gameui/wscript index dedcb95c..d508bbd9 100755 --- a/gameui/wscript +++ b/gameui/wscript @@ -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'] - install_path = bld.env.PREFIX + install_path = bld.env.LIBDIR bld.shlib( source = source, diff --git a/inputsystem/wscript b/inputsystem/wscript index 4441a012..3ff6305d 100755 --- a/inputsystem/wscript +++ b/inputsystem/wscript @@ -35,7 +35,7 @@ def build(bld): libs = ['tier0','tier1','tier2','vstdlib','SDL2','steam_api'] - install_path = bld.env.PREFIX + install_path = bld.env.LIBDIR bld.shlib( source = source, diff --git a/ivp b/ivp index 72b80536..be91ef64 160000 --- a/ivp +++ b/ivp @@ -1 +1 @@ -Subproject commit 72b80536ba0aceabc012224970488893c166a0a2 +Subproject commit be91ef6413e2ff771c4484f7d5bd009d3bb90322 diff --git a/launcher/wscript b/launcher/wscript index 6fac8ff4..7af6dd6b 100755 --- a/launcher/wscript +++ b/launcher/wscript @@ -33,7 +33,7 @@ def build(bld): libs = ['tier0','tier1','tier2','tier3','vstdlib','steam_api','appframework','SDL2','togl'] - install_path = bld.env.PREFIX + install_path = bld.env.LIBDIR bld.shlib( source = source, diff --git a/launcher_main/wscript b/launcher_main/wscript index fd66e858..622952bc 100755 --- a/launcher_main/wscript +++ b/launcher_main/wscript @@ -5,7 +5,7 @@ from waflib import Utils import os top = '.' -PROJECT_NAME = 'hl2' +PROJECT_NAME = 'hl2_launcher' def options(opt): # stub @@ -27,7 +27,7 @@ def build(bld): libs += ['USER32', 'SHELL32'] source += ['launcher_main.rc'] - install_path = bld.env.PREFIX + install_path = bld.env.BINDIR bld( source = source, target = PROJECT_NAME, diff --git a/materialsystem/shaderapidx9/wscript b/materialsystem/shaderapidx9/wscript index 771519d5..168d8539 100755 --- a/materialsystem/shaderapidx9/wscript +++ b/materialsystem/shaderapidx9/wscript @@ -58,7 +58,7 @@ def build(bld): libs = ['tier0','tier1','tier2','vstdlib','togl','bitmap','mathlib'] - install_path = bld.env.PREFIX + install_path = bld.env.LIBDIR bld.shlib( source = source, diff --git a/materialsystem/shaderlib/wscript b/materialsystem/shaderlib/wscript index 4f758024..7c6e2ab9 100755 --- a/materialsystem/shaderlib/wscript +++ b/materialsystem/shaderlib/wscript @@ -34,8 +34,6 @@ def build(bld): libs = [] - install_path = bld.env.PREFIX - bld.stlib( source = source, target = PROJECT_NAME, @@ -44,7 +42,6 @@ def build(bld): includes = includes, defines = defines, use = libs, - install_path = install_path, subsystem = bld.env.MSVC_SUBSYSTEM, idx = bld.get_taskgen_count() ) diff --git a/materialsystem/stdshaders/wscript b/materialsystem/stdshaders/wscript index ecf1c982..c4a82640 100644 --- a/materialsystem/stdshaders/wscript +++ b/materialsystem/stdshaders/wscript @@ -150,7 +150,7 @@ def build(bld): libs = ['tier0','shaderlib','tier1','mathlib'] - install_path = bld.env.PREFIX + install_path = bld.env.LIBDIR bld.shlib( source = source, diff --git a/materialsystem/wscript b/materialsystem/wscript index 3daa0639..4bb7d2f8 100755 --- a/materialsystem/wscript +++ b/materialsystem/wscript @@ -60,7 +60,7 @@ def build(bld): libs = ['tier0','tier1','tier2','vstdlib','mathlib','bitmap','shaderlib','vtf'] - install_path = bld.env.PREFIX + install_path = bld.env.LIBDIR bld.shlib( source = source, diff --git a/mathlib/wscript b/mathlib/wscript index 2b3ed24d..9dfc1d1a 100755 --- a/mathlib/wscript +++ b/mathlib/wscript @@ -1,4 +1,4 @@ - #! /usr/bin/env python +#! /usr/bin/env python # encoding: utf-8 from waflib import Utils @@ -52,8 +52,6 @@ def build(bld): libs = [] - install_path = bld.env.PREFIX - bld.stlib( source = source, target = PROJECT_NAME, @@ -62,7 +60,6 @@ def build(bld): includes = includes, defines = defines, use = libs, - install_path = install_path, subsystem = bld.env.MSVC_SUBSYSTEM, idx = bld.get_taskgen_count() ) diff --git a/scenefilecache/wscript b/scenefilecache/wscript index b59c2f3a..a63db9a9 100755 --- a/scenefilecache/wscript +++ b/scenefilecache/wscript @@ -32,7 +32,7 @@ def build(bld): libs = ['tier0','tier1'] - install_path = bld.env.PREFIX + install_path = bld.env.LIBDIR bld.shlib( source = source, diff --git a/scripts/waifulib/__pycache__/compiler_optimizations.cpython-39.pyc b/scripts/waifulib/__pycache__/compiler_optimizations.cpython-39.pyc deleted file mode 100644 index 1dc9038b..00000000 Binary files a/scripts/waifulib/__pycache__/compiler_optimizations.cpython-39.pyc and /dev/null differ diff --git a/scripts/waifulib/__pycache__/enforce_pic.cpython-39.pyc b/scripts/waifulib/__pycache__/enforce_pic.cpython-39.pyc deleted file mode 100644 index 4c8fad24..00000000 Binary files a/scripts/waifulib/__pycache__/enforce_pic.cpython-39.pyc and /dev/null differ diff --git a/scripts/waifulib/__pycache__/xcompile.cpython-38.pyc b/scripts/waifulib/__pycache__/xcompile.cpython-38.pyc deleted file mode 100644 index 1afaee57..00000000 Binary files a/scripts/waifulib/__pycache__/xcompile.cpython-38.pyc and /dev/null differ diff --git a/scripts/waifulib/__pycache__/xcompile.cpython-39.pyc b/scripts/waifulib/__pycache__/xcompile.cpython-39.pyc deleted file mode 100644 index cfb561d0..00000000 Binary files a/scripts/waifulib/__pycache__/xcompile.cpython-39.pyc and /dev/null differ diff --git a/scripts/waifulib/__pycache__/xshlib.cpython-38.pyc b/scripts/waifulib/__pycache__/xshlib.cpython-38.pyc deleted file mode 100644 index 2966c609..00000000 Binary files a/scripts/waifulib/__pycache__/xshlib.cpython-38.pyc and /dev/null differ diff --git a/scripts/waifulib/__pycache__/xshlib.cpython-39.pyc b/scripts/waifulib/__pycache__/xshlib.cpython-39.pyc deleted file mode 100644 index f9733c6d..00000000 Binary files a/scripts/waifulib/__pycache__/xshlib.cpython-39.pyc and /dev/null differ diff --git a/serverbrowser/wscript b/serverbrowser/wscript index 9af6519c..1dc3cb8f 100755 --- a/serverbrowser/wscript +++ b/serverbrowser/wscript @@ -55,7 +55,7 @@ def build(bld): libs = ['tier0','vgui_controls','mathlib','tier1','tier2','tier3','vstdlib','steam_api'] - install_path = bld.env.PREFIX + install_path = bld.env.LIBDIR bld.shlib( source = source, diff --git a/soundemittersystem/wscript b/soundemittersystem/wscript index 82df5bf9..9a8dcf0a 100755 --- a/soundemittersystem/wscript +++ b/soundemittersystem/wscript @@ -36,7 +36,7 @@ def build(bld): libs = ['tier0','tier1','vstdlib'] - install_path = bld.env.PREFIX + install_path = bld.env.LIBDIR bld.shlib( source = source, diff --git a/studiorender/wscript b/studiorender/wscript index bc0dd0b5..60277910 100755 --- a/studiorender/wscript +++ b/studiorender/wscript @@ -43,7 +43,7 @@ def build(bld): libs = ['tier0','tier1','tier2','tier3','vstdlib','mathlib','bitmap'] - install_path = bld.env.PREFIX + install_path = bld.env.LIBDIR bld.shlib( source = source, diff --git a/thirdparty b/thirdparty index 31ae58f6..ecce0cec 160000 --- a/thirdparty +++ b/thirdparty @@ -1 +1 @@ -Subproject commit 31ae58f64f9169db7f4e02c83dba46e5a47e0c7b +Subproject commit ecce0cecc39b32bdf704542e3cb870ba4e2e8e42 diff --git a/tier0/wscript b/tier0/wscript index bf4a18c2..9f6e39bb 100755 --- a/tier0/wscript +++ b/tier0/wscript @@ -67,7 +67,7 @@ def build(bld): libs = ['DL'] - install_path = bld.env.PREFIX + install_path = bld.env.LIBDIR bld.shlib( source = source, diff --git a/tier1/wscript b/tier1/wscript index 61b4810c..0df2dc4f 100755 --- a/tier1/wscript +++ b/tier1/wscript @@ -75,8 +75,6 @@ def build(bld): libs = [] - install_path = bld.env.PREFIX - bld.stlib( source = source, target = PROJECT_NAME, diff --git a/tier2/wscript b/tier2/wscript index acde70d8..3e83666c 100755 --- a/tier2/wscript +++ b/tier2/wscript @@ -49,8 +49,6 @@ def build(bld): libs = [] - install_path = bld.env.PREFIX - bld.stlib( source = source, target = PROJECT_NAME, @@ -59,7 +57,6 @@ def build(bld): includes = includes, defines = defines, use = libs, - install_path = install_path, subsystem = bld.env.MSVC_SUBSYSTEM, idx = bld.get_taskgen_count() ) diff --git a/tier3/wscript b/tier3/wscript index 045354b6..d92e8011 100755 --- a/tier3/wscript +++ b/tier3/wscript @@ -37,8 +37,6 @@ def build(bld): libs = [] - install_path = bld.env.PREFIX - bld.stlib( source = source, target = PROJECT_NAME, @@ -47,7 +45,6 @@ def build(bld): includes = includes, defines = defines, use = libs, - install_path = install_path, subsystem = bld.env.MSVC_SUBSYSTEM, idx = bld.get_taskgen_count() ) diff --git a/togl/wscript b/togl/wscript index de8a3229..bdce47f3 100755 --- a/togl/wscript +++ b/togl/wscript @@ -46,7 +46,7 @@ def build(bld): libs = ['tier0','tier1','tier2','vstdlib','mathlib'] - install_path = bld.env.PREFIX + install_path = bld.env.LIBDIR bld.shlib( source = source, diff --git a/vgui2/matsys_controls/wscript b/vgui2/matsys_controls/wscript index e4060854..258f608b 100644 --- a/vgui2/matsys_controls/wscript +++ b/vgui2/matsys_controls/wscript @@ -50,8 +50,6 @@ def build(bld): libs = [] - install_path = bld.env.PREFIX - bld.stlib( source = source, target = PROJECT_NAME, @@ -60,7 +58,6 @@ def build(bld): includes = includes, defines = defines, use = libs, - install_path = install_path, subsystem = bld.env.MSVC_SUBSYSTEM, idx = bld.get_taskgen_count() ) diff --git a/vgui2/src/wscript b/vgui2/src/wscript index 951fd9b4..f4e5547c 100644 --- a/vgui2/src/wscript +++ b/vgui2/src/wscript @@ -52,7 +52,7 @@ def build(bld): libs = ['tier0','tier1','tier2','tier3','vstdlib','SDL2'] - install_path = bld.env.PREFIX + install_path = bld.env.LIBDIR bld.shlib( source = source, diff --git a/vgui2/vgui_controls/wscript b/vgui2/vgui_controls/wscript index bb87e435..4962d364 100644 --- a/vgui2/vgui_controls/wscript +++ b/vgui2/vgui_controls/wscript @@ -106,8 +106,6 @@ def build(bld): libs = [] - install_path = bld.env.PREFIX - bld.stlib( source = source, target = PROJECT_NAME, @@ -116,7 +114,6 @@ def build(bld): includes = includes, defines = defines, use = libs, - install_path = install_path, subsystem = bld.env.MSVC_SUBSYSTEM, idx = bld.get_taskgen_count() ) diff --git a/vgui2/vgui_surfacelib/wscript b/vgui2/vgui_surfacelib/wscript index e3aa859d..44dc4e78 100644 --- a/vgui2/vgui_surfacelib/wscript +++ b/vgui2/vgui_surfacelib/wscript @@ -38,8 +38,6 @@ def build(bld): libs = [] - install_path = bld.env.PREFIX - bld.stlib( source = source, target = PROJECT_NAME, @@ -48,7 +46,6 @@ def build(bld): includes = includes, defines = defines, use = libs, - install_path = install_path, subsystem = bld.env.MSVC_SUBSYSTEM, idx = bld.get_taskgen_count() ) diff --git a/vguimatsurface/wscript b/vguimatsurface/wscript index 2e1dd39c..90ebb812 100644 --- a/vguimatsurface/wscript +++ b/vguimatsurface/wscript @@ -45,7 +45,7 @@ def build(bld): 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( source = source, @@ -58,4 +58,4 @@ def build(bld): install_path = install_path, subsystem = bld.env.MSVC_SUBSYSTEM, idx = bld.get_taskgen_count() - ) \ No newline at end of file + ) diff --git a/video/wscript b/video/wscript index fee20855..30d7a560 100755 --- a/video/wscript +++ b/video/wscript @@ -31,7 +31,7 @@ def build(bld): libs = ['tier0','tier1','tier2','tier3','vstdlib'] - install_path = bld.env.PREFIX + install_path = bld.env.LIBDIR bld.shlib( source = source, diff --git a/vphysics/wscript b/vphysics/wscript index d2c5d994..fb6d4fa2 100755 --- a/vphysics/wscript +++ b/vphysics/wscript @@ -63,7 +63,7 @@ def build(bld): 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( source = source, diff --git a/vpklib/wscript b/vpklib/wscript index be5aab32..1210aac6 100755 --- a/vpklib/wscript +++ b/vpklib/wscript @@ -32,8 +32,6 @@ def build(bld): libs = [] - install_path = bld.env.PREFIX - bld.stlib( source = source, target = PROJECT_NAME, @@ -42,7 +40,6 @@ def build(bld): includes = includes, defines = defines, use = libs, - install_path = install_path, subsystem = bld.env.MSVC_SUBSYSTEM, idx = bld.get_taskgen_count() ) diff --git a/vstdlib/wscript b/vstdlib/wscript index f97ea542..730ab25c 100755 --- a/vstdlib/wscript +++ b/vstdlib/wscript @@ -40,7 +40,7 @@ def build(bld): libs = ['tier0','tier1'] - install_path = bld.env.PREFIX + install_path = bld.env.LIBDIR bld.shlib( source = source, diff --git a/vtf/wscript b/vtf/wscript index 154cb5ee..3698d0c4 100755 --- a/vtf/wscript +++ b/vtf/wscript @@ -34,8 +34,6 @@ def build(bld): libs = [] - install_path = bld.env.PREFIX - bld.stlib( source = source, target = PROJECT_NAME, @@ -44,7 +42,6 @@ def build(bld): includes = includes, defines = defines, use = libs, - install_path = install_path, subsystem = bld.env.MSVC_SUBSYSTEM, idx = bld.get_taskgen_count() ) diff --git a/wscript b/wscript index ee042686..f408f343 100644 --- a/wscript +++ b/wscript @@ -1,6 +1,6 @@ #! /usr/bin/env python # encoding: utf-8 -# a1batross, mittorn, 2018 +# a1batross, mittorn, nillerusr from __future__ import print_function from waflib import Logs, Context, Configure @@ -104,8 +104,6 @@ def options(opt): opt.load('reconfigure') def configure(conf): - conf.env.PREFIX = '.' - conf.load('fwgslib reconfigure') # Force XP compability, all build targets should add @@ -219,8 +217,8 @@ def configure(conf): if conf.env.DEST_OS != 'android': conf.env.LIBDIR = conf.env.PREFIX+'/bin/' conf.env.BINDIR = conf.env.PREFIX - - conf.env.LIBDIR = conf.env.BINDIR = conf.env.PREFIX + else: + conf.env.LIBDIR = conf.env.BINDIR = conf.env.PREFIX define_platform(conf) conf.add_subproject(projects)