diff --git a/run_cmake.py b/run_cmake.py index 3826b4a..928262f 100644 --- a/run_cmake.py +++ b/run_cmake.py @@ -22,6 +22,8 @@ def run(project, arguments, buildType=''): if arg.startswith('-G'): explicitGenerator = True cmake.append(arg) + if sys.platform == 'win32' and (vsArch == 'x64' or os.environ['Platform'] == 'x64'): + basePath = scriptPath + '/../out64/' + buildType if sys.platform == 'win32' and not explicitGenerator: if vsArch == 'x64': cmake.append('-Ax64') diff --git a/variables.cmake b/variables.cmake index 65b1e4e..230a960 100644 --- a/variables.cmake +++ b/variables.cmake @@ -91,13 +91,13 @@ endif() #if (DESKTOP_APP_ASAN AND WIN32) # if (build_win64) -# get_filename_component(libs_loc "../Libraries/asan-win64" REALPATH) +# get_filename_component(libs_loc "../Libraries64/asan" REALPATH) # else() # get_filename_component(libs_loc "../Libraries/asan" REALPATH) # endif() #elseif (build_win64) if (build_win64) - get_filename_component(libs_loc "../Libraries/win64" REALPATH) + get_filename_component(libs_loc "../Libraries64" REALPATH) else() get_filename_component(libs_loc "../Libraries" REALPATH) endif()