From 906eeb6b94f6318b7e0286ccde9df2d3031d92a5 Mon Sep 17 00:00:00 2001
From: Cory McWilliams <cory@unprompted.com>
Date: Thu, 18 Jan 2018 03:12:25 +0000
Subject: [PATCH] Fixes windows.  Probably breaks linux.  v8.

git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@3415 ed5197a5-7fde-0310-b194-c3ffbd925b24
---
 SConstruct | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/SConstruct b/SConstruct
index 5c0449c8..23450aeb 100644
--- a/SConstruct
+++ b/SConstruct
@@ -23,19 +23,17 @@ Help(options.GenerateHelpText(env))
 v8 = env['v8']
 uv = env['uv']
 liblmdb = env['lmdb']
-libs = []
 env.Append(CPPPATH=[
 	os.path.join(v8, 'include'),
 	v8,
 	os.path.join(uv, 'include'),
 	os.path.join(liblmdb, 'libraries', 'liblmdb'),
 ])
-grouped_libs = []
 
 objectSuffix = '.obj' if sys.platform == 'win32' else '.o'
 raspi = platform.machine() == 'armv7l'
 if raspi:
-	libs += [
+	env.Append(LIBS = [
 		os.path.join(v8, 'out', 'arm.release', 'obj.target', 'src', 'libv8_libplatform.a'),
 		os.path.join(v8, 'out', 'arm.release', 'obj.target', 'src', 'libv8_base.a'),
 		os.path.join(v8, 'out', 'arm.release', 'obj.target', 'src', 'libv8_libbase.a'),
@@ -43,19 +41,18 @@ if raspi:
 		os.path.join(v8, 'out', 'arm.release', 'obj.target', 'src', 'libv8_nosnapshot.a'),
 		os.path.join(v8, 'out', 'arm.release', 'obj.target', 'third_party', 'icu', 'libicui18n.a'),
 		os.path.join(v8, 'out', 'arm.release', 'obj.target', 'third_party', 'icu', 'libicuuc.a'),
-	]
+	])
 else:
-	grouped_libs += ['-Wl,--start-group']
-	grouped_libs += [env.Library('build/bin/v8_libplatform', Glob(os.path.join(v8, 'out', 'obj', 'v8_libplatform', '*' + objectSuffix)))]
-	grouped_libs += [env.Library('build/bin/v8_base', Glob(os.path.join(v8, 'out', 'obj', 'v8_base', '*' + objectSuffix)))]
-	grouped_libs += [env.Library('build/bin/v8_builtins_setup', Glob(os.path.join(v8, 'out', 'obj', 'v8_builtins_setup', '*' + objectSuffix)))]
-	grouped_libs += [env.Library('build/bin/v8_libbase', Glob(os.path.join(v8, 'out', 'obj', 'v8_libbase', '*' + objectSuffix)))]
-	grouped_libs += [env.Library('build/bin/v8_builtins_generators', Glob(os.path.join(v8, 'out', 'obj', 'v8_builtins_generators', '*' + objectSuffix)))]
-	grouped_libs += [env.Library('build/bin/v8_libsampler', Glob(os.path.join(v8, 'out', 'obj', 'v8_libsampler', '*' + objectSuffix)))]
-	grouped_libs += [env.Library('build/bin/v8_snapshot', Glob(os.path.join(v8, 'out', 'obj', 'v8_snapshot', '*' + objectSuffix)))]
-	grouped_libs += [env.Library('build/bin/icui18n', Glob(os.path.join(v8, 'out', 'obj', 'third_party', 'icu', 'icui18n', '*' + objectSuffix)))]
-	grouped_libs += [env.Library('build/bin/icuuc', Glob(os.path.join(v8, 'out', 'obj', 'third_party', 'icu', 'icuuc', '*' + objectSuffix)))]
-	grouped_libs += ['-Wl,--end-group']
+	env.Append(LIBS = [
+		os.path.join(v8, 'out', 'obj', 'v8_libplatform'),
+		os.path.join(v8, 'out', 'obj', 'v8_base_0'),
+		os.path.join(v8, 'out', 'obj', 'v8_base_1'),
+		os.path.join(v8, 'out', 'obj', 'v8_libbase'),
+		os.path.join(v8, 'out', 'obj', 'v8_libsampler'),
+		os.path.join(v8, 'out', 'obj', 'v8_snapshot'),
+		os.path.join(v8, 'out', 'obj', 'third_party', 'icu', 'icui18n'),
+		os.path.join(v8, 'out', 'obj', 'third_party', 'icu', 'icuuc'),
+	])
 
 if sys.platform == 'win32':
 	env.Append(LIBS=['libuv', 'advapi32', 'winmm', 'wsock32', 'ws2_32', 'psapi', 'iphlpapi', 'userenv', 'user32', 'dbghelp', 'shlwapi'])
@@ -102,10 +99,7 @@ if sys.platform == 'darwin':
 	env.Append(FRAMEWORKS=['CoreFoundation', 'Security'])
 elif sys.platform == 'win32':
 	env.Append(LIBS=['Crypt32'])
-if grouped_libs:
-	env.Append(GROUPED_LIBS = grouped_libs)
-	env.Append(LINKCOM = ' $GROUPED_LIBS')
-env.Program('tildefriends', source + libs)
+env.Program('tildefriends', source)
 
 def listAllFiles(root):
 	for root, dirs, files in os.walk(root):