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

This reverts commit 7ed329c11f.
2018-10-04 17:59:40 +00:00
parent 22b43e3869
commit 1ca4517f46
12 changed files with 339 additions and 328 deletions
@@ -2,26 +2,27 @@
 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')
+  ]
+  binary.compiler.defines += ['CURL_STATICLIB']
+  if binary.compiler.family == 'gcc' or binary.compiler.family == 'clang':
+    binary.compiler.cxxflags += ['-fno-rtti']
+  elif binary.compiler.family == 'msvc':
+    binary.compiler.cxxflags += ['/GR-']
+  binary.compiler.postlink += [libcurl[arch].binary]
+  if builder.target.platform == 'linux':
+    binary.compiler.postlink += ['-lrt']
+  elif builder.target.platform == 'windows':
+    binary.compiler.postlink += ['ws2_32.lib']

-binary = SM.ExtLibrary(builder, 'webternet.ext', arch)
-binary.compiler.includes += [
-  os.path.join(builder.sourcePath, 'extensions', 'curl', 'curl-src', 'include')
-]
-binary.compiler.defines += ['CURL_STATICLIB']
-if binary.compiler.family == 'gcc' or binary.compiler.family == 'clang':
-  binary.compiler.cxxflags += ['-fno-rtti']
-elif binary.compiler.family == 'msvc':
-  binary.compiler.cxxflags += ['/GR-']
-binary.compiler.postlink += [libcurl[arch].binary]
-if builder.target.platform == 'linux':
-  binary.compiler.postlink += ['-lrt']
-elif builder.target.platform == 'windows':
-  binary.compiler.postlink += ['ws2_32.lib']
+  binary.sources += [
+    'extension.cpp',
+    'curlapi.cpp',
+    '../../public/smsdk_ext.cpp'
+  ]

-binary.sources += [
-  'extension.cpp',
-  'curlapi.cpp',
-  '../../public/smsdk_ext.cpp'
-]
+  SM.extensions += [builder.Add(binary)]

-SM.extensions += [builder.Add(binary)]