UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed master amb script for darwin (r=dvander).

Browse Source
This commit is contained in:
Scott Ehlert 2010-05-11 00:10:36 -07:00
parent b9ea1d1be4
commit 3d4754d4ad
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AMBuildScript
View File

@ -144,6 +144,7 @@ class SM:
self.compiler.AddToListVar('CFLAGS', '-mmacosx-version-min=10.5') self.compiler.AddToListVar('CFLAGS', '-mmacosx-version-min=10.5')
self.compiler.AddToListVar('POSTLINKFLAGS', ['-isysroot', self.compiler.AddToListVar('POSTLINKFLAGS', ['-isysroot',
'/Developer/SDKs/MacOSX10.5.sdk']) '/Developer/SDKs/MacOSX10.5.sdk'])
self.compiler.AddToListVar('POSTLINKFLAGS', ['-arch', 'i386'])
elif AMBuild.target['platform'] == 'windows': elif AMBuild.target['platform'] == 'windows':
self.compiler.AddToListVar('CDEFINES', 'WIN32') self.compiler.AddToListVar('CDEFINES', 'WIN32')
self.compiler.AddToListVar('CDEFINES', '_WINDOWS') self.compiler.AddToListVar('CDEFINES', '_WINDOWS')

2
extensions/regex/AMBuilder
View File

@ -11,6 +11,8 @@ if AMBuild.target['platform'] == 'linux':
path = os.path.join(AMBuild.sourceFolder, 'extensions', 'regex', 'lib_linux', 'libpcre.a') path = os.path.join(AMBuild.sourceFolder, 'extensions', 'regex', 'lib_linux', 'libpcre.a')
elif AMBuild.target['platform'] == 'windows': elif AMBuild.target['platform'] == 'windows':
path = os.path.join(AMBuild.sourceFolder, 'extensions', 'regex', 'lib_win', 'pcre.lib') path = os.path.join(AMBuild.sourceFolder, 'extensions', 'regex', 'lib_win', 'pcre.lib')
elif AMBuild.target['platform'] == 'darwin':
path = os.path.join(AMBuild.sourceFolder, 'extensions', 'regex', 'lib_darwin', 'libpcre.a')
binary.RelinkIfNewer(path) binary.RelinkIfNewer(path)
binary['POSTLINKFLAGS'].append(path) binary['POSTLINKFLAGS'].append(path)

2
loader/AMBuilder
View File

@ -5,7 +5,7 @@ compiler = SM.DefaultCompiler()
compiler['CXXINCLUDES'].append(os.path.join(SM.mmsPath, 'core')) compiler['CXXINCLUDES'].append(os.path.join(SM.mmsPath, 'core'))
compiler['CXXINCLUDES'].append(os.path.join(SM.mmsPath, 'core', 'sourcehook')) compiler['CXXINCLUDES'].append(os.path.join(SM.mmsPath, 'core', 'sourcehook'))
if AMBuild.target['platform'] == 'windows': if AMBuild.target['platform'] == 'windows' or AMBuild.target['platform'] == 'darwin':
name = 'sourcemod_mm' name = 'sourcemod_mm'
elif AMBuild.target['platform'] == 'linux': elif AMBuild.target['platform'] == 'linux':
name = 'sourcemod_mm_i486' name = 'sourcemod_mm_i486'