Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix missing binary suffix

Browse Source
This commit is contained in:
Arkshine 2014-12-10 15:05:47 +01:00
parent 8443a836aa
commit f4a3d07b0e
4 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
AMBuildScript
View File

@ -304,30 +304,21 @@ class AMXXConfig(object):
return self.AddVersioning(binary) return self.AddVersioning(binary)
def MetaPlugin(self, context, name): def MetaPlugin(self, context, name):
binary = context.compiler.Library(name)
self.ConfigureForModule(context, binary.compiler)
if builder.target_platform == 'mac' or builder.target_platform == 'windows': if builder.target_platform == 'mac' or builder.target_platform == 'windows':
name = name + '_mm' name = name + '_mm'
elif builder.target_platform == 'linux': elif builder.target_platform == 'linux':
name = name + '_mm_i386' name = name + '_mm_i386'
return self.AddVersioning(binary)
def Module(self, context, name):
binary = context.compiler.Library(name) binary = context.compiler.Library(name)
self.ConfigureForModule(context, binary.compiler) self.ConfigureForModule(context, binary.compiler)
return self.AddVersioning(binary) return self.AddVersioning(binary)
def MetaModule(self, context, name): def MetaModule(self, context, name):
binary = context.compiler.Library(name)
self.ConfigureForModule(context, binary.compiler)
if builder.target_platform == 'mac' or builder.target_platform == 'windows': if builder.target_platform == 'mac' or builder.target_platform == 'windows':
name = name + '_amxx' name = name + '_amxx'
elif builder.target_platform == 'linux': elif builder.target_platform == 'linux':
name = name + '_amxx_i386' name = name + '_amxx_i386'
binary = context.compiler.Library(name)
self.ConfigureForModule(context, binary.compiler)
return self.AddVersioning(binary) return self.AddVersioning(binary)
def Program(self, context, name): def Program(self, context, name):

2
dlls/nvault/AMBuilder
View File

@ -1,7 +1,7 @@
# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python: # vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
import os.path import os.path
binary = AMXX.Module(builder, 'nvault') binary = AMXX.MetaModule(builder, 'nvault')
binary.compiler.defines += [ binary.compiler.defines += [
'HAVE_STDINT_H', 'HAVE_STDINT_H',

2
dlls/regex/AMBuilder
View File

@ -1,7 +1,7 @@
# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python: # vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
import os.path import os.path
binary = AMXX.Module(builder, 'regex') binary = AMXX.MetaModule(builder, 'regex')
if builder.target_platform == 'linux': if builder.target_platform == 'linux':
binary.compiler.postlink += [binary.Dep('lib_linux/libpcre.a')] binary.compiler.postlink += [binary.Dep('lib_linux/libpcre.a')]

2
dlls/sockets/AMBuilder
View File

@ -1,7 +1,7 @@
# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python: # vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
import os.path import os.path
binary = AMXX.Module(builder, 'sockets') binary = AMXX.MetaModule(builder, 'sockets')
binary.sources = [ binary.sources = [
'../../public/sdk/amxxmodule.cpp', '../../public/sdk/amxxmodule.cpp',