kotatogram/cmake_helpers
1
0
Fork 0
Code Issues Activity

[Dev] Use Libraries64 folder instead of Libraries/win64 on Windows

Browse source
This commit is contained in:
Eric Kotato 2022-09-15 23:09:19 +03:00 • committed by Eric Kotato
parent a32690808b
commit 30a7163fbf
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
run_cmake.py
View file

@ -22,6 +22,8 @@ def run(project, arguments, buildType=''):
if arg.startswith('-G'): if arg.startswith('-G'):
explicitGenerator = True explicitGenerator = True
cmake.append(arg) 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 sys.platform == 'win32' and not explicitGenerator:
if vsArch == 'x64': if vsArch == 'x64':
cmake.append('-Ax64') cmake.append('-Ax64')

4
variables.cmake
View file

@ -91,13 +91,13 @@ endif()
#if (DESKTOP_APP_ASAN AND WIN32) #if (DESKTOP_APP_ASAN AND WIN32)
# if (build_win64) # if (build_win64)
# get_filename_component(libs_loc "../Libraries/asan-win64" REALPATH) # get_filename_component(libs_loc "../Libraries64/asan" REALPATH)
# else() # else()
# get_filename_component(libs_loc "../Libraries/asan" REALPATH) # get_filename_component(libs_loc "../Libraries/asan" REALPATH)
# endif() # endif()
#elseif (build_win64) #elseif (build_win64)
if (build_win64) if (build_win64)
get_filename_component(libs_loc "../Libraries/win64" REALPATH) get_filename_component(libs_loc "../Libraries64" REALPATH)
else() else()
get_filename_component(libs_loc "../Libraries" REALPATH) get_filename_component(libs_loc "../Libraries" REALPATH)
endif() endif()