diff --git a/android/app/CMakeLists.txt b/android/app/CMakeLists.txt index bddc6913..953c6b4a 100644 --- a/android/app/CMakeLists.txt +++ b/android/app/CMakeLists.txt @@ -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}" diff --git a/scripts/gha/deps_android.sh b/scripts/gha/deps_android.sh index 658c626a..15b57a2e 100755 --- a/scripts/gha/deps_android.sh +++ b/scripts/gha/deps_android.sh @@ -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"