From 5620e7ab4c6505885594eebb56c3661dbb163880 Mon Sep 17 00:00:00 2001
From: Alibek Omarov <a1ba.omarov@gmail.com>
Date: Tue, 25 Feb 2025 07:59:18 +0300
Subject: [PATCH] android: fixup CMAKE_LIBRARY_OUTPUT_DIRECTORY on Win32, merge
 stdout and stderr for waf output

---
 android/app/CMakeLists.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/android/app/CMakeLists.txt b/android/app/CMakeLists.txt
index b23598c1..08f6ac7b 100644
--- a/android/app/CMakeLists.txt
+++ b/android/app/CMakeLists.txt
@@ -49,6 +49,9 @@ add_subdirectory("${ENGINE_SOURCE_DIR}/3rdparty/SDL" SDL)
 
 include(ExternalProject)
 
+# gradle passes backslashes to cmake, how does this even work for everybody else?
+string(REPLACE "\\" "/" CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
+
 ExternalProject_Add(
 	Xash3DFWGS
 	SOURCE_DIR ${ENGINE_SOURCE_DIR}
@@ -60,6 +63,7 @@ ExternalProject_Add(
 	LOG_BUILD TRUE
 	LOG_INSTALL TRUE
 	LOG_OUTPUT_ON_FAILURE TRUE
+	LOG_MERGED_STDOUTERR TRUE
 
 #	USES_TERMINAL_CONFIGURE TRUE
 #	USES_TERMINAL_BUILD TRUE