mirror of
https://github.com/FWGS/xash3d-fwgs
synced 2024-11-22 01:45:19 +01:00
android: don't add verbose flags to waf, fix SDL path on CI
This commit is contained in:
parent
22fef6fa36
commit
8407af17f4
@ -21,7 +21,7 @@ endif()
|
||||
|
||||
if(CMAKE_SIZEOF_VOID_P MATCHES "8")
|
||||
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()
|
||||
|
||||
set(CMAKE_VERBOSE_MAKEFILE ON)
|
||||
@ -36,7 +36,7 @@ execute_process(
|
||||
COMMAND ${CMAKE_COMMAND} -E env
|
||||
CC=${WAF_CC} CXX=${WAF_CXX}
|
||||
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}
|
||||
-s "${ENGINE_SOURCE_DIR}/SDL" --skip-sdl2-sanity-check
|
||||
WORKING_DIRECTORY "${ENGINE_SOURCE_DIR}"
|
||||
|
@ -18,7 +18,7 @@ git clone --depth 1 --recursive https://github.com/FWGS/hlsdk-portable -b mobile
|
||||
echo "Download SDL"
|
||||
pushd 3rdparty
|
||||
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
|
||||
|
||||
echo "Download Android SDK"
|
||||
|
Loading…
Reference in New Issue
Block a user