cory/tildefriends
4
5
Fork 1
Code Issues 33 Pull Requests 1 Actions Releases 27 Wiki Activity

Fixes OSX.

Browse Source 
git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@3280 ed5197a5-7fde-0310-b194-c3ffbd925b24
This commit is contained in:
Cory McWilliams 2016-07-23 17:02:15 +00:00
parent 14682d8be7
commit d35fe752eb
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SConstruct
View File

@ -37,11 +37,11 @@ if sys.platform == 'win32':
env.Append(LINKFLAGS=['/RELEASE', '/OPT:REF', '/OPT:ICF']) env.Append(LINKFLAGS=['/RELEASE', '/OPT:REF', '/OPT:ICF'])
elif sys.platform == 'darwin': elif sys.platform == 'darwin':
env.Append(LIBS=['v8_base', 'v8_libbase', 'v8_libplatform', 'v8_nosnapshot', 'icui18n', 'icuuc', 'icudata', 'pthread', 'uv']) env.Append(LIBS=['v8_base', 'v8_libbase', 'v8_libplatform', 'v8_nosnapshot', 'icui18n', 'icuuc', 'icudata', 'pthread', 'uv'])
env.Append(CXXFLAGS=['--std=c++11', '-g', '-Wall', '-stdlib=libstdc++']) env.Append(CXXFLAGS=['--std=c++11', '-g', '-Wall', '-stdlib=libc++'])
env.Append(CFLAGS=['-g', '-Wall']) env.Append(CFLAGS=['-g', '-Wall'])
env.Append(LINKFLAGS=['-g', '-stdlib=libstdc++']) env.Append(LINKFLAGS=['-g', '-stdlib=libc++'])
env.Append(LIBPATH=[ env.Append(LIBPATH=[
os.path.join(v8, 'xcodebuild/Release'), os.path.join(v8, 'out/native'),
os.path.join(uv, 'build/Release'), os.path.join(uv, 'build/Release'),
]) ])
else: else:

3
tools/update-deps
View File

@ -125,8 +125,7 @@ def updateV8():
if sys.platform == 'linux2': if sys.platform == 'linux2':
run(['make', '-j' + str(cores), 'native'], cwd=kV8Work) run(['make', '-j' + str(cores), 'native'], cwd=kV8Work)
elif sys.platform == 'darwin': elif sys.platform == 'darwin':
run(['build/gyp_v8', '-Dtarget_arch=x64'], cwd=kV8Work) run(['make', '-j' + str(cores), 'native'], cwd=kV8Work)
run(['xcodebuild', '-project', 'build/all.xcodeproj', '-configuration', 'Release'], cwd=kV8Work)
elif sys.platform == 'win32': elif sys.platform == 'win32':
run(['python', 'build\\gyp_v8', '-Dtarget_arch=x64'], cwd=kV8Work, env=win32Env) run(['python', 'build\\gyp_v8', '-Dtarget_arch=x64'], cwd=kV8Work, env=win32Env)
run(['devenv.com', '/Build', 'Release', 'build\\All.sln'], cwd=kV8Work) run(['devenv.com', '/Build', 'Release', 'build\\All.sln'], cwd=kV8Work)