d4708
/
source-engine
mirror of https://github.com/nillerusr/source-engine.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

waf: fix install

pull/11/head
nillerusr 3 years ago
parent
f0c72952c8
commit
597f9da3b0
48 changed files with 36 additions and 75 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      .gitignore
  2. 3
      appframework/wscript
  3. 3
      bitmap/wscript
  4. 2
      datacache/wscript
  5. 3
      datamodel/wscript
  6. 3
      dmxloader/wscript
  7. 2
      engine/voice_codecs/minimp3/wscript
  8. 2
      engine/wscript
  9. 2
      filesystem/wscript
  10. 2
      game/client/wscript
  11. 3
      game/server/wscript
  12. 2
      gameui/wscript
  13. 2
      inputsystem/wscript
  14. 2
      ivp
  15. 2
      launcher/wscript
  16. 4
      launcher_main/wscript
  17. 2
      materialsystem/shaderapidx9/wscript
  18. 3
      materialsystem/shaderlib/wscript
  19. 2
      materialsystem/stdshaders/wscript
  20. 2
      materialsystem/wscript
  21. 5
      mathlib/wscript
  22. 2
      scenefilecache/wscript
  23. BIN
      scripts/waifulib/__pycache__/compiler_optimizations.cpython-39.pyc
  24. BIN
      scripts/waifulib/__pycache__/enforce_pic.cpython-39.pyc
  25. BIN
      scripts/waifulib/__pycache__/xcompile.cpython-38.pyc
  26. BIN
      scripts/waifulib/__pycache__/xcompile.cpython-39.pyc
  27. BIN
      scripts/waifulib/__pycache__/xshlib.cpython-38.pyc
  28. BIN
      scripts/waifulib/__pycache__/xshlib.cpython-39.pyc
  29. 2
      serverbrowser/wscript
  30. 2
      soundemittersystem/wscript
  31. 2
      studiorender/wscript
  32. 2
      thirdparty
  33. 2
      tier0/wscript
  34. 2
      tier1/wscript
  35. 3
      tier2/wscript
  36. 3
      tier3/wscript
  37. 2
      togl/wscript
  38. 3
      vgui2/matsys_controls/wscript
  39. 2
      vgui2/src/wscript
  40. 3
      vgui2/vgui_controls/wscript
  41. 3
      vgui2/vgui_surfacelib/wscript
  42. 4
      vguimatsurface/wscript
  43. 2
      video/wscript
  44. 2
      vphysics/wscript
  45. 3
      vpklib/wscript
  46. 2
      vstdlib/wscript
  47. 3
      vtf/wscript
  48. 8
      wscript

3
.gitignore vendored
Unescape View File

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

3
appframework/wscript
Unescape View File

@ -36,8 +36,6 @@ def build(bld): @@ -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): @@ -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()
)

3
bitmap/wscript
Unescape View File

@ -44,8 +44,6 @@ def build(bld): @@ -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): @@ -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()
)

2
datacache/wscript vendored
Unescape View File

@ -35,7 +35,7 @@ def build(bld): @@ -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,

3
datamodel/wscript
Unescape View File

@ -41,8 +41,6 @@ def build(bld): @@ -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): @@ -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()
)

3
dmxloader/wscript
Unescape View File

@ -35,8 +35,6 @@ def build(bld): @@ -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): @@ -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()
)

2
engine/voice_codecs/minimp3/wscript
Unescape View File

@ -30,7 +30,7 @@ def build(bld): @@ -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,

2
engine/wscript
Unescape View File

@ -329,7 +329,7 @@ def build(bld): @@ -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,

2
filesystem/wscript
Unescape View File

@ -44,7 +44,7 @@ def build(bld): @@ -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,

2
game/client/wscript
Unescape View File

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

3
game/server/wscript
Unescape View File

@ -602,7 +602,7 @@ def build(bld): @@ -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): @@ -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()

2
gameui/wscript
Unescape View File

@ -109,7 +109,7 @@ def build(bld): @@ -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,

2
inputsystem/wscript
Unescape View File

@ -35,7 +35,7 @@ def build(bld): @@ -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,

2
ivp

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

2
launcher/wscript
Unescape View File

@ -33,7 +33,7 @@ def build(bld): @@ -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,

4
launcher_main/wscript
Unescape View File

@ -5,7 +5,7 @@ from waflib import Utils @@ -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): @@ -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,

2
materialsystem/shaderapidx9/wscript
Unescape View File

@ -58,7 +58,7 @@ def build(bld): @@ -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,

3
materialsystem/shaderlib/wscript
Unescape View File

@ -34,8 +34,6 @@ def build(bld): @@ -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): @@ -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()
)

2
materialsystem/stdshaders/wscript
Unescape View File

@ -150,7 +150,7 @@ def build(bld): @@ -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,

2
materialsystem/wscript
Unescape View File

@ -60,7 +60,7 @@ def build(bld): @@ -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,

5
mathlib/wscript
Unescape View File

@ -1,4 +1,4 @@ @@ -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): @@ -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): @@ -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()
)

2
scenefilecache/wscript vendored
Unescape View File

@ -32,7 +32,7 @@ def build(bld): @@ -32,7 +32,7 @@ def build(bld):
libs = ['tier0','tier1']
install_path = bld.env.PREFIX
install_path = bld.env.LIBDIR
bld.shlib(
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
Unescape View File

@ -55,7 +55,7 @@ def build(bld): @@ -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,

2
soundemittersystem/wscript
Unescape View File

@ -36,7 +36,7 @@ def build(bld): @@ -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,

2
studiorender/wscript
Unescape View File

@ -43,7 +43,7 @@ def build(bld): @@ -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,

2
thirdparty

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

2
tier0/wscript
Unescape View File

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

2
tier1/wscript
Unescape View File

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

3
tier2/wscript
Unescape View File

@ -49,8 +49,6 @@ def build(bld): @@ -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): @@ -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()
)

3
tier3/wscript
Unescape View File

@ -37,8 +37,6 @@ def build(bld): @@ -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): @@ -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()
)

2
togl/wscript
Unescape View File

@ -46,7 +46,7 @@ def build(bld): @@ -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,

3
vgui2/matsys_controls/wscript
Unescape View File

@ -50,8 +50,6 @@ def build(bld): @@ -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): @@ -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()
)

2
vgui2/src/wscript
Unescape View File

@ -52,7 +52,7 @@ def build(bld): @@ -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,

3
vgui2/vgui_controls/wscript
Unescape View File

@ -106,8 +106,6 @@ def build(bld): @@ -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): @@ -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()
)

3
vgui2/vgui_surfacelib/wscript
Unescape View File

@ -38,8 +38,6 @@ def build(bld): @@ -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): @@ -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()
)

4
vguimatsurface/wscript
Unescape View File

@ -45,7 +45,7 @@ def build(bld): @@ -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): @@ -58,4 +58,4 @@ def build(bld):
install_path = install_path,
subsystem = bld.env.MSVC_SUBSYSTEM,
idx = bld.get_taskgen_count()
)
)

2
video/wscript
Unescape View File

@ -31,7 +31,7 @@ def build(bld): @@ -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,

2
vphysics/wscript
Unescape View File

@ -63,7 +63,7 @@ def build(bld): @@ -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,

3
vpklib/wscript
Unescape View File

@ -32,8 +32,6 @@ def build(bld): @@ -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): @@ -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()
)

2
vstdlib/wscript
Unescape View File

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

3
vtf/wscript
Unescape View File

@ -34,8 +34,6 @@ def build(bld): @@ -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): @@ -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()
)

8
wscript
Unescape View File

@ -1,6 +1,6 @@ @@ -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): @@ -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): @@ -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)

Write Preview
Loading…
Cancel
Save