From bf698087f838bd2eae8d53bfa1871e3e84f23d97 Mon Sep 17 00:00:00 2001 From: Cory McWilliams Date: Mon, 19 Sep 2016 12:50:54 +0000 Subject: [PATCH] It looks like we can build v8 with .lib files with gn/ninja on Windows after all. git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@3339 ed5197a5-7fde-0310-b194-c3ffbd925b24 --- SConstruct | 2 +- tools/update-deps | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/SConstruct b/SConstruct index 6dabc03b2..023a54a49 100644 --- a/SConstruct +++ b/SConstruct @@ -31,7 +31,7 @@ if sys.platform == 'win32': env.Append(CXXFLAGS=['/EHsc', '/MT', '/Zi', '/Gy']) env.Append(CFLAGS=['/EHsc', '/MT', '/Zi', '/Gy']) env.Append(LIBPATH=[ - os.path.join(v8, 'build/Release/lib'), + os.path.join(v8, 'out/native'), os.path.join(uv, 'Release/lib'), ]) env.Append(LINKFLAGS=['/RELEASE', '/OPT:REF', '/OPT:ICF']) diff --git a/tools/update-deps b/tools/update-deps index f25502fde..817e64e52 100755 --- a/tools/update-deps +++ b/tools/update-deps @@ -113,7 +113,6 @@ def updateV8(): win32Env = os.environ.copy() win32Env['DEPOT_TOOLS_WIN_TOOLCHAIN'] = '0' win32Env['GYP_MSVS_VERSION'] = '2015' - win32Env['GYP_GENERATORS'] = 'msvs' open(os.path.join(kV8Work, '.update-deps-branch'), 'w').write(kV8Branch) run(['git', 'fetch'], cwd=kV8Work) @@ -129,8 +128,8 @@ def updateV8(): elif sys.platform == 'darwin': run(['make', '-j' + str(cores), 'native'], cwd=kV8Work) elif sys.platform == 'win32': - run(['python', 'gypfiles\\gyp_v8', '-Dtarget_arch=x64'], cwd=kV8Work, env=win32Env) - run(['devenv.com', 'src\\v8.sln', '/Build', 'Release'], cwd=kV8Work) + run(['gn', 'gen', 'out/native', '--args="is_component_build=true"']) + run(['ninja', '-C', 'out/native']) if __name__ == '__main__': updateUv()