vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

android: fixup CMAKE_LIBRARY_OUTPUT_DIRECTORY on Win32, merge stdout and stderr for waf output

Browse source
This commit is contained in:
Alibek Omarov 2025-02-25 07:59:18 +03:00
parent a76236ac5a
commit 5620e7ab4c
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/app/CMakeLists.txt
View file

@ -49,6 +49,9 @@ add_subdirectory("${ENGINE_SOURCE_DIR}/3rdparty/SDL" SDL)
include(ExternalProject) 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( ExternalProject_Add(
Xash3DFWGS Xash3DFWGS
SOURCE_DIR ${ENGINE_SOURCE_DIR} SOURCE_DIR ${ENGINE_SOURCE_DIR}
@ -60,6 +63,7 @@ ExternalProject_Add(
LOG_BUILD TRUE LOG_BUILD TRUE
LOG_INSTALL TRUE LOG_INSTALL TRUE
LOG_OUTPUT_ON_FAILURE TRUE LOG_OUTPUT_ON_FAILURE TRUE
LOG_MERGED_STDOUTERR TRUE
# USES_TERMINAL_CONFIGURE TRUE # USES_TERMINAL_CONFIGURE TRUE
# USES_TERMINAL_BUILD TRUE # USES_TERMINAL_BUILD TRUE