FWGS/xash3d-fwgs
2
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs synced 2024-11-22 09:56:22 +01:00
Code Issues 2 Projects Releases Wiki Activity

android: don't add verbose flags to waf, fix SDL path on CI

Browse Source
This commit is contained in:
Alibek Omarov 2024-11-20 07:23:40 +03:00
parent 22fef6fa36
commit 8407af17f4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android/app/CMakeLists.txt
View File

@ -21,7 +21,7 @@ endif()
if(CMAKE_SIZEOF_VOID_P MATCHES "8") if(CMAKE_SIZEOF_VOID_P MATCHES "8")
set(64BIT ON CACHE BOOL "" FORCE) set(64BIT ON CACHE BOOL "" FORCE)
set(WAF_EXTRA_ARGS "-8") set(WAF_EXTRA_ARGS "-8") # only required for x86 when testing this cmakelist under linux
endif() endif()
set(CMAKE_VERBOSE_MAKEFILE ON) set(CMAKE_VERBOSE_MAKEFILE ON)
@ -36,7 +36,7 @@ execute_process(
COMMAND ${CMAKE_COMMAND} -E env COMMAND ${CMAKE_COMMAND} -E env
CC=${WAF_CC} CXX=${WAF_CXX} CC=${WAF_CC} CXX=${WAF_CXX}
AR=${CMAKE_AR} STRIP=${CMAKE_STRIP} AR=${CMAKE_AR} STRIP=${CMAKE_STRIP}
${PYTHON_EXECUTABLE} waf configure -vvv -T ${BUILD_TYPE} ${WAF_EXTRA_ARGS} cmake ${PYTHON_EXECUTABLE} waf configure -T ${BUILD_TYPE} ${WAF_EXTRA_ARGS} cmake
--check-c-compiler=${C_COMPILER_ID} --check-cxx-compiler=${CXX_COMPILER_ID} --check-c-compiler=${C_COMPILER_ID} --check-cxx-compiler=${CXX_COMPILER_ID}
-s "${ENGINE_SOURCE_DIR}/SDL" --skip-sdl2-sanity-check -s "${ENGINE_SOURCE_DIR}/SDL" --skip-sdl2-sanity-check
WORKING_DIRECTORY "${ENGINE_SOURCE_DIR}" WORKING_DIRECTORY "${ENGINE_SOURCE_DIR}"

2
scripts/gha/deps_android.sh
View File

@ -18,7 +18,7 @@ git clone --depth 1 --recursive https://github.com/FWGS/hlsdk-portable -b mobile
echo "Download SDL" echo "Download SDL"
pushd 3rdparty pushd 3rdparty
wget https://github.com/libsdl-org/SDL/releases/download/release-$SDL_VERSION/SDL2-$SDL_VERSION.tar.gz | tar -xzf - wget https://github.com/libsdl-org/SDL/releases/download/release-$SDL_VERSION/SDL2-$SDL_VERSION.tar.gz | tar -xzf -
mv SDL2-$SDL_VERSION SDL mv SDL2-$SDL_VERSION 3rdparty/SDL
popd popd
echo "Download Android SDK" echo "Download Android SDK"