From bf344282ec0304e47c27840d7a43311587e2ed97 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Sun, 9 Feb 2025 16:20:19 +0300 Subject: [PATCH] android: explicitly set Waf output directory so it doesn't mess with current configuration and places generated files where CMake expects them to be --- android/app/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/app/CMakeLists.txt b/android/app/CMakeLists.txt index cac2cbb6..4bbaa8da 100644 --- a/android/app/CMakeLists.txt +++ b/android/app/CMakeLists.txt @@ -37,7 +37,7 @@ execute_process( COMMAND ${CMAKE_COMMAND} -E env CC=${WAF_CC} CXX=${WAF_CXX} AR=${CMAKE_AR} STRIP=${CMAKE_STRIP} - ${PYTHON_EXECUTABLE} waf configure -T ${BUILD_TYPE} ${WAF_EXTRA_ARGS} cmake + ${PYTHON_EXECUTABLE} waf configure -T ${BUILD_TYPE} -o "${CMAKE_CURRENT_BINARY_DIR}/xash3d-fwgs" ${WAF_EXTRA_ARGS} cmake --check-c-compiler=${C_COMPILER_ID} --check-cxx-compiler=${CXX_COMPILER_ID} -s "${ENGINE_SOURCE_DIR}/SDL" --skip-sdl2-sanity-check --enable-bundled-deps WORKING_DIRECTORY "${ENGINE_SOURCE_DIR}"