@@ -577,15 +577,15 @@ def fix_cmake_variables_for_MD_library(undo=False, try_undo=False):
577577 # This replacements must be unique for the undo operation
578578 # to be reliable.
579579
580- mt_find = r 'CEF_RUNTIME_LIBRARY_FLAG "/MT"'
581- mt_replace = r 'CEF_RUNTIME_LIBRARY_FLAG "/MD"'
580+ mt_find = u 'CEF_RUNTIME_LIBRARY_FLAG "/MT"'
581+ mt_replace = u 'CEF_RUNTIME_LIBRARY_FLAG "/MD"'
582582
583- wd4275_find = ('/wd4244 '
584- '# Ignore "conversion possible loss of data" warning' )
585- wd4275_replace = ('/wd4244 '
586- '# Ignore "conversion possible loss of data" warning'
587- '\r \n '
588- ' /wd4275 # Ignore "non dll-interface class"' )
583+ wd4275_find = (u '/wd4244 '
584+ u '# Ignore "conversion possible loss of data" warning'
585+ wd4275_replace = (u '/wd4244 '
586+ u '# Ignore "conversion possible loss of data" warning'
587+ u '\r \n '
588+ u ' /wd4275 # Ignore "non dll-interface class"'
589589
590590 cmake_variables = os .path .join (Options .cef_binary , "cmake" ,
591591 "cef_variables.cmake" )
@@ -996,13 +996,10 @@ def run_automate_git():
996996 # later in cef_binary/ with cmake/ninja do works fine.
997997 args .append ("--build-target=cefsimple" )
998998
999- # On Windows automate-git.py must be run using Python 2.7
1000- # from depot_tools. depot_tools should already be added to PATH.
1001- python = "python" # *do not* replace with sys.executable!
1002999 args = " " .join (args )
10031000 command = script + " " + args
10041001 working_dir = Options .cef_build_dir
1005- return run_command ("%s %s" % (python , command ), working_dir )
1002+ return run_command ("%s %s" % (sys . executable , command ), working_dir )
10061003
10071004
10081005def run_make_distrib ():
0 commit comments