From 96e388e7cb5432bbb8e766f5279f53597a5893cd Mon Sep 17 00:00:00 2001 From: RadRussianRus Date: Thu, 15 Sep 2022 23:09:19 +0300 Subject: [PATCH] [Dev] Use Libraries64 folder instead of Libraries/win64 on Windows --- run_cmake.py | 1 + validate_special_target.cmake | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/run_cmake.py b/run_cmake.py index ccfb873..67631ec 100644 --- a/run_cmake.py +++ b/run_cmake.py @@ -25,6 +25,7 @@ def run(project, arguments, buildType=''): if sys.platform == 'win32': if windowsArch == 'x64': cmake.append('-Ax64') + basePath = scriptPath + '/../out64/' + buildType else: cmake.append('-AWin32') # default elif windowsArch != '': diff --git a/validate_special_target.cmake b/validate_special_target.cmake index 50d2bf5..ebc9442 100644 --- a/validate_special_target.cmake +++ b/validate_special_target.cmake @@ -8,7 +8,12 @@ include(CMakeDependentOption) set(DESKTOP_APP_SPECIAL_TARGET "" CACHE STRING "Use special platform target, like 'macstore' for Mac App Store.") -get_filename_component(libs_loc "../Libraries" REALPATH) +if (build_win64) + get_filename_component(libs_loc "../Libraries64" REALPATH) +else() + get_filename_component(libs_loc "../Libraries" REALPATH) +endif() + set(libs_loc_exists 0) if (EXISTS ${libs_loc}) set(libs_loc_exists 1)