Commit f7947140 authored by forDream's avatar forDream

Fix building with Windows. #1684

Signed-off-by: default avatarforDream <gam2046@users.noreply.github.com>
parent ec803d98
...@@ -38,7 +38,7 @@ android { ...@@ -38,7 +38,7 @@ android {
task goBuild(type: Exec) { task goBuild(type: Exec) {
if (Os.isFamily(Os.FAMILY_WINDOWS)) { if (Os.isFamily(Os.FAMILY_WINDOWS)) {
executable "cmd.exe" executable "cmd.exe"
args "/c", "src\\overture\\make.bat " + minSdkVersion args "/c", file("src/overture/make.bat").absolutePath , minSdkVersion
} else { } else {
executable "sh" executable "sh"
args "-c", "src/overture/make.bash " + minSdkVersion args "-c", "src/overture/make.bash " + minSdkVersion
...@@ -48,7 +48,7 @@ task goBuild(type: Exec) { ...@@ -48,7 +48,7 @@ task goBuild(type: Exec) {
task goClean(type: Exec) { task goClean(type: Exec) {
if (Os.isFamily(Os.FAMILY_WINDOWS)) { if (Os.isFamily(Os.FAMILY_WINDOWS)) {
executable "cmd.exe" executable "cmd.exe"
args "/c", "src\\overture\\clean.bat" args "/c", file("src/overture/clean.bat").absolutePath
} else { } else {
executable "sh" executable "sh"
args "-c", "src/overture/clean.bash" args "-c", "src/overture/clean.bash"
......
...@@ -28,21 +28,35 @@ MKDIR %TARGET%\armeabi-v7a>nul 2>nul ...@@ -28,21 +28,35 @@ MKDIR %TARGET%\armeabi-v7a>nul 2>nul
MKDIR %TARGET%\x86>nul 2>nul MKDIR %TARGET%\x86>nul 2>nul
MKDIR %TARGET%\arm64-v8a>nul 2>nul MKDIR %TARGET%\arm64-v8a>nul 2>nul
SET CC=%ANDROID_NDK_HOME%\toolchains\arm-linux-androideabi-4.9\prebuilt\windows-x86_64\bin\arm-linux-androideabi-gcc.exe
REM Check environment availability
IF NOT EXIST %CC% (
ECHO "gcc not found"
EXIT 1
)
WHERE python.exe
IF "%ERRORLEVEL%" == 1 (
ECHO "python not found"
EXIT 1
)
IF NOT EXIST %ANDROID_ARM_CC% ( IF NOT EXIST %ANDROID_ARM_CC% (
ECHO "Make standalone toolchain for ARM arch" ECHO "Make standalone toolchain for ARM arch"
%ANDROID_NDK_HOME%\build\tools\make_standalone_toolchain.py --arch arm ^ python.exe %ANDROID_NDK_HOME%\build\tools\make_standalone_toolchain.py --arch arm ^
--api %MIN_API% --install-dir %ANDROID_ARM_TOOLCHAIN% --api %MIN_API% --install-dir %ANDROID_ARM_TOOLCHAIN%
) )
IF NOT EXIST %ANDROID_ARM64_CC% ( IF NOT EXIST %ANDROID_ARM64_CC% (
ECHO "Make standalone toolchain for ARM64 arch" ECHO "Make standalone toolchain for ARM64 arch"
%ANDROID_NDK_HOME%\build\tools\make_standalone_toolchain.py --arch arm64 ^ python.exe %ANDROID_NDK_HOME%\build\tools\make_standalone_toolchain.py --arch arm64 ^
--api %MIN_API% --install-dir %ANDROID_ARM64_TOOLCHAIN% --api %MIN_API% --install-dir %ANDROID_ARM64_TOOLCHAIN%
) )
IF NOT EXIST %ANDROID_X86_CC% ( IF NOT EXIST %ANDROID_X86_CC% (
ECHO "Make standalone toolchain for X86 arch" ECHO "Make standalone toolchain for X86 arch"
%ANDROID_NDK_HOME%\build\tools\make_standalone_toolchain.py --arch x86 ^ python.exe %ANDROID_NDK_HOME%\build\tools\make_standalone_toolchain.py --arch x86 ^
--api %MIN_API% --install-dir %ANDROID_X86_TOOLCHAIN% --api %MIN_API% --install-dir %ANDROID_X86_TOOLCHAIN%
) )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment