rooty/HLMetaModOfficial
1
0
Fork 0
mirror of https://github.com/alliedmodders/metamod-source.git synced 2025-01-19 08:52:34 +01:00
Code Issues Releases Activity

Updated for CS:S sync (r=asherkin).

Browse Source
This commit is contained in:
Peace-Maker 2013-02-05 21:26:40 +00:00
parent 9530aa33ae
commit afa0fcaa74
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
AMBuildScript
View File

@ -266,7 +266,7 @@ class MMS:
else: else:
staticLibs = os.path.join(sdkPath, 'lib', 'linux') staticLibs = os.path.join(sdkPath, 'lib', 'linux')
workFolder = os.path.join(AMBuild.outputFolder, job.workFolder) workFolder = os.path.join(AMBuild.outputFolder, job.workFolder)
if sdk == 'ep2v': if sdk in ['ep2v', 'css']:
libs = ['tier1_i486.a', 'libvstdlib_srv.so', 'libtier0_srv.so'] libs = ['tier1_i486.a', 'libvstdlib_srv.so', 'libtier0_srv.so']
for lib in libs: for lib in libs:
link = os.path.join(workFolder, lib) link = os.path.join(workFolder, lib)
@ -275,7 +275,7 @@ class MMS:
os.lstat(link) os.lstat(link)
except: except:
job.AddCommand(SymlinkCommand(link, target)) job.AddCommand(SymlinkCommand(link, target))
elif sdk in ['css', 'l4d', 'l4d2', 'csgo']: elif sdk in ['l4d', 'l4d2', 'csgo']:
libs = ['tier1_i486.a', 'libvstdlib.so', 'libtier0.so'] libs = ['tier1_i486.a', 'libvstdlib.so', 'libtier0.so']
if sdk == 'csgo': if sdk == 'csgo':
libs.insert(0, 'interfaces_i486.a') libs.insert(0, 'interfaces_i486.a')
@ -372,10 +372,10 @@ class MMS:
if not noLink: if not noLink:
if AMBuild.target['platform'] == 'linux': if AMBuild.target['platform'] == 'linux':
compiler['POSTLINKFLAGS'][0:0] = ['-lm'] compiler['POSTLINKFLAGS'][0:0] = ['-lm']
if sdk == 'ep2v': if sdk in ['ep2v', 'css']:
compiler['POSTLINKFLAGS'][0:0] = ['libtier0_srv.so'] compiler['POSTLINKFLAGS'][0:0] = ['libtier0_srv.so']
compiler['POSTLINKFLAGS'][0:0] = ['libvstdlib_srv.so'] compiler['POSTLINKFLAGS'][0:0] = ['libvstdlib_srv.so']
elif sdk in ['css', 'l4d', 'l4d2', 'csgo']: elif sdk in ['l4d', 'l4d2', 'csgo']:
compiler['POSTLINKFLAGS'][0:0] = ['libtier0.so'] compiler['POSTLINKFLAGS'][0:0] = ['libtier0.so']
compiler['POSTLINKFLAGS'][0:0] = ['libvstdlib.so'] compiler['POSTLINKFLAGS'][0:0] = ['libvstdlib.so']
else: else:

2
core/Makefile
View File

@ -57,7 +57,7 @@ ifeq "$(ENGINE)" "css"
INCLUDE += -I$(HL2SDK)/public/game/server INCLUDE += -I$(HL2SDK)/public/game/server
BINARY = metamod.2.css.so BINARY = metamod.2.css.so
LIB_PREFIX = lib LIB_PREFIX = lib
LIB_SUFFIX = .so LIB_SUFFIX = _srv.so
override ENGSET = true override ENGSET = true
endif endif
ifeq "$(ENGINE)" "orangeboxvalve" ifeq "$(ENGINE)" "orangeboxvalve"

2
sample_mm/Makefile
View File

@ -100,7 +100,7 @@ ifneq (,$(filter original orangebox,$(ENGINE)))
LIB_SUFFIX = _i486.$(LIB_EXT) LIB_SUFFIX = _i486.$(LIB_EXT)
else else
LIB_PREFIX = lib LIB_PREFIX = lib
ifeq "$(ENGINE)" "orangeboxvalve" ifneq (,$(filter orangeboxvalve css,$(ENGINE)))
ifneq "$(OS)" "Darwin" ifneq "$(OS)" "Darwin"
LIB_SUFFIX = _srv.$(LIB_EXT) LIB_SUFFIX = _srv.$(LIB_EXT)
else else

2
stub_mm/Makefile
View File

@ -100,7 +100,7 @@ ifneq (,$(filter original orangebox,$(ENGINE)))
LIB_SUFFIX = _i486.$(LIB_EXT) LIB_SUFFIX = _i486.$(LIB_EXT)
else else
LIB_PREFIX = lib LIB_PREFIX = lib
ifeq "$(ENGINE)" "orangeboxvalve" ifneq (,$(filter orangeboxvalve css,$(ENGINE)))
ifneq "$(OS)" "Darwin" ifneq "$(OS)" "Darwin"
LIB_SUFFIX = _srv.$(LIB_EXT) LIB_SUFFIX = _srv.$(LIB_EXT)
else else