Merge branch 'master' into windows

This commit is contained in:
HappyDOGE
2022-07-27 12:58:56 +03:00
3089 changed files with 38642 additions and 844823 deletions

View File

@@ -14,8 +14,8 @@ games = {
'hl2mp': ['server_base.vpc', 'server_hl2mp.vpc'],
'portal': ['server_base.vpc', 'server_portal.vpc'],
'hl1': ['server_base.vpc', 'server_hl1.vpc'],
'hl1mp': ['server_base.vpc', 'server_hl1.vpc'],
'css': ['server_base.vpc', 'server_cstrike.vpc', 'nav_mesh.vpc'],
'hl1mp': ['server_base.vpc', 'server_hl1mp.vpc'],
'cstrike': ['server_base.vpc', 'server_cstrike.vpc', 'nav_mesh.vpc'],
'dod': ['server_base.vpc', 'server_dod.vpc'],
'tf': [
'server_base.vpc',
@@ -33,6 +33,8 @@ def configure(conf):
game = conf.options.GAMES
conf.env.GAMES = game
conf.env.append_unique('DEFINES', ['DISABLE_STEAM=1'])
if game not in games.keys():
conf.fatal("Couldn't find game: ", game)