Revert "Remove arch loops from build scripts. (#889)"

This reverts commit 7ed329c11f.

AMBuildScript

@@ -639,40 +639,32 @@ for arch in SM.archs:
      SP.libsourcepawn[arch]
   ]
 
-NonSDKBuilds = [
+BuildScripts = [
+  'loader/AMBuilder',
+  'core/AMBuilder',
   'core/logic/AMBuilder',
   'extensions/bintools/AMBuilder',
   'extensions/clientprefs/AMBuilder',
   'extensions/curl/AMBuilder',
-  'extensions/geoip/AMBuilder',
-  'extensions/regex/AMBuilder',
-  'extensions/sqlite/AMBuilder',
-  'extensions/topmenus/AMBuilder',
-  'extensions/updater/AMBuilder',
-  'loader/AMBuilder',
-]
-if SM.mysql_root:
-  NonSDKBuilds += [
-    'extensions/mysql/AMBuilder',
-  ]
-for arch in SM.archs:
-  builder.Build(NonSDKBuilds, { 'SM': SM, 'arch': arch })
-
-SDKBuilds = [
-  'core/AMBuilder',
   'extensions/cstrike/AMBuilder',
+  'extensions/geoip/AMBuilder',
+  'extensions/mysql/AMBuilder',
+  'extensions/regex/AMBuilder',
   'extensions/sdkhooks/AMBuilder',
   'extensions/sdktools/AMBuilder',
+  'extensions/sqlite/AMBuilder',
   'extensions/tf2/AMBuilder',
+  'extensions/topmenus/AMBuilder',
+  'extensions/updater/AMBuilder',
 ]
-builder.Build(SDKBuilds, { 'SM': SM })
 
 if builder.backend == 'amb2':
-  OtherScripts = [
+  BuildScripts += [
     'plugins/AMBuilder',
     'tools/buildbot/PackageScript',
   ]
-  builder.Build(OtherScripts, { 'SM': SM })
+
+builder.Build(BuildScripts, { 'SM': SM })
 
 if builder.options.breakpad_dump:
   builder.Build('tools/buildbot/BreakpadSymbols', { 'SM': SM })

core/logic/AMBuilder

@@ -1,6 +1,7 @@
 # vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
 import os
 
+for arch in SM.archs:
   binary = SM.Library(builder, 'sourcemod.logic', arch)
   binary.compiler.cxxincludes += [
     builder.sourcePath,

extensions/bintools/AMBuilder

@@ -1,6 +1,7 @@
 # vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
 import os
 
+for arch in SM.archs:
   binary = SM.ExtLibrary(builder, 'bintools.ext', arch)
   binary.compiler.defines += ['HOOKING_ENABLED']
   binary.compiler.cxxincludes += [
@@ -26,3 +27,4 @@ else:
     binary.sources += ['jit_call.cpp']
 
   SM.extensions += [builder.Add(binary)]
+

extensions/clientprefs/AMBuilder

@@ -1,6 +1,7 @@
 # vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
 import os
 
+for arch in SM.archs:
   binary = SM.ExtLibrary(builder, 'clientprefs.ext', arch)
   binary.compiler.cxxincludes += [
     os.path.join(SM.mms_root, 'core', 'sourcehook'),
@@ -20,3 +21,4 @@ binary.sources += [
   ]
 
   SM.extensions += [builder.Add(binary)]
+

extensions/curl/AMBuilder

@@ -2,7 +2,7 @@
 import os
 
 libcurl = builder.Build('curl-src/lib/AMBuilder')
-
+for arch in SM.archs:
   binary = SM.ExtLibrary(builder, 'webternet.ext', arch)
   binary.compiler.includes += [
     os.path.join(builder.sourcePath, 'extensions', 'curl', 'curl-src', 'include')
@@ -25,3 +25,4 @@ binary.sources += [
   ]
 
   SM.extensions += [builder.Add(binary)]
+

extensions/geoip/AMBuilder

@@ -1,6 +1,7 @@
 # vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
 import os
 
+for arch in SM.archs:
   binary = SM.ExtLibrary(builder, 'geoip.ext', arch)
   if binary.compiler.family == 'gcc' or binary.compiler.family == 'clang':
     binary.compiler.cxxflags += ['-fno-rtti']
@@ -16,3 +17,4 @@ binary.sources += [
   ]
 
   SM.extensions += [builder.Add(binary)]
+

extensions/mysql/AMBuilder

@@ -1,6 +1,8 @@
 # vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
 import os
 
+if SM.mysql_root:
+  for arch in SM.archs:
     binary = SM.ExtLibrary(builder, 'dbi.mysql.ext', arch)
     binary.compiler.cxxincludes += [
       os.path.join(SM.mysql_root[arch], 'include'),
@@ -43,3 +45,4 @@ if binary.compiler.family == 'msvc' and binary.compiler.version >= 1900:
       binary.compiler.defines += ['HAVE_STRUCT_TIMESPEC']
 
     SM.extensions += [builder.Add(binary)]
+

extensions/regex/AMBuilder

@@ -1,6 +1,7 @@
 # vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
 import os
 
+for arch in SM.archs:
   binary = SM.ExtLibrary(builder, 'regex.ext', arch)
   binary.compiler.cxxincludes += [
     os.path.join(SM.mms_root, 'core', 'sourcehook'),
@@ -31,3 +32,4 @@ binary.sources += [
   ]
 
   SM.extensions += [builder.Add(binary)]
+

extensions/sqlite/AMBuilder

@@ -1,6 +1,7 @@
 # vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
 import os
 
+for arch in SM.archs:
   binary = SM.ExtLibrary(builder, 'dbi.sqlite.ext', arch)
   binary.compiler.cxxincludes += [
     os.path.join(SM.mms_root, 'core', 'sourcehook'),
@@ -30,3 +31,4 @@ binary.sources += [
   ]
 
   SM.extensions += [builder.Add(binary)]
+

extensions/topmenus/AMBuilder

@@ -1,6 +1,7 @@
 # vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
 import os
 
+for arch in SM.archs:
   binary = SM.ExtLibrary(builder, 'topmenus.ext', arch)
   binary.compiler.cxxincludes += [
     os.path.join(SM.mms_root, 'core', 'sourcehook'),

extensions/updater/AMBuilder

@@ -1,6 +1,7 @@
 # vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
 import os
 
+for arch in SM.archs:
   binary = SM.ExtLibrary(builder, 'updater.ext', arch)
   binary.compiler.cxxincludes += [
     os.path.join(SM.mms_root, 'core', 'sourcehook'),
@@ -19,3 +20,4 @@ binary.sources += [
   ]
 
   SM.extensions += [builder.Add(binary)]
+

loader/AMBuilder

@@ -1,6 +1,7 @@
 # vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
 import os.path
 
+for arch in SM.archs:
   if builder.target.platform in ['windows', 'mac']:
     name = 'sourcemod_mm'
     extra_ldflags = []