Index: make.py |
diff --git a/make.py b/make.py |
index fc959a05ced5963461d85d001e4f83bd73588787..00a7c6da26c3cdd8314ca7ee5692a090c64ca083 100644 |
--- a/make.py |
+++ b/make.py |
@@ -53,48 +53,12 @@ def MakeClean(): |
rmtree(OUT_SUBDIR) |
-def CheckWindowsEnvironment(): |
- """For Windows: check environment variables needed for command-line build. |
- |
- If those environment variables are missing, try to set them. |
- If environment variables can be set up, this function returns; otherwise, |
- it displays an error message and exits. |
- """ |
- # If we already have the proper environment variables, nothing to do here. |
- try: |
- env_DevEnvDir = os.environ['DevEnvDir'] |
- return # found it, so we are done |
- except KeyError: |
- pass # go on and run the rest of this function |
- |
- print ('\nCould not find Visual Studio environment variables.' |
- '\nPerhaps you have not yet run vcvars32.bat as described at' |
- '\nhttp://msdn.microsoft.com/en-us/library/f2ccy3wt.aspx ?') |
- found_path = None |
- try: |
- possible_path = os.path.abspath(os.path.join( |
- os.environ['VS100COMNTOOLS'], os.path.pardir, os.path.pardir, |
- 'VC', 'bin', 'vcvars32.bat')) |
- if os.path.exists(possible_path): |
- found_path = possible_path |
- except KeyError: |
- pass |
- if found_path: |
- print '\nIt looks like you can run that script at:\n%s' % found_path |
- else: |
- print '\nUnable to find vcvars32.bat on your system.' |
- sys.exit(1) |
- |
- |
def MakeWindows(targets): |
"""For Windows: build as appropriate for the command line arguments. |
parameters: |
targets: build targets as a list of strings |
""" |
- # TODO(epoger): I'm not sure if this is needed for ninja builds. |
- CheckWindowsEnvironment() |
- |
# Run gyp_skia to prepare Visual Studio projects. |
cd(SCRIPT_DIR) |
runcommand('python gyp_skia') |