Merge pull request #476 from Alireza-Ta/android_enhancement

Android Compilation Enhancement
This commit is contained in:
Milan Nikolic 2024-12-17 12:51:49 +01:00 committed by GitHub
commit edb2c107b3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 17 additions and 7 deletions

View file

@ -20,12 +20,12 @@
) )
:COMPILE :COMPILE
@echo compiling for platform %FL% @echo compiling for platform %FL% and architecture %GOARCH%
@set CGO_CFLAGS="-I%ANDROID_SYSROOT%/usr/include -I%ANDROID_SYSROOT%/usr/include/%TRIPLE% --sysroot=%ANDROID_SYSROOT% -D__ANDROID_API__=%ANDROID_API%" @set CGO_CFLAGS="-I%ANDROID_SYSROOT%/usr/include -I%ANDROID_SYSROOT%/usr/include/%TRIPLE% --sysroot=%ANDROID_SYSROOT% -D__ANDROID_API__=%ANDROID_API%"
@set CGO_LDFLAGS="-L%ANDROID_SYSROOT%/usr/lib/%TRIPLE%/%ANDROID_API% -L%ANDROID_TOOLCHAIN%/%TRIPLE%/lib --sysroot=%ANDROID_SYSROOT%" @set CGO_LDFLAGS="-L%ANDROID_SYSROOT%/usr/lib/%TRIPLE%/%ANDROID_API% -L%ANDROID_TOOLCHAIN%/%TRIPLE%/lib --sysroot=%ANDROID_SYSROOT%"
@set CGO_ENABLED=1 @set CGO_ENABLED=1
@set GOOS=android @set GOOS=android
@set GOARCH=arm @set GOARCH=%GOARCH%
@go build -buildmode=c-shared -ldflags="-s -w -extldflags=-Wl,-soname,lib%LIBRARY_NAME%.so" -o=android/libs/%FL%/lib%LIBRARY_NAME%.so @go build -buildmode=c-shared -ldflags="-s -w -extldflags=-Wl,-soname,lib%LIBRARY_NAME%.so" -o=android/libs/%FL%/lib%LIBRARY_NAME%.so
@EXIT /B @EXIT /B
@ -48,21 +48,21 @@
@set GOARCH=arm @set GOARCH=arm
@CALL:COMPILE ) @CALL:COMPILE )
@IF %TARGET_ARCH% == "arm64-v8a" ( @IF %TARGET_ARCH% == "arm64-v8a" (
@set CC="armv7a-linux-androideabi%ANDROID_API%-clang" @set CC="aarch64-linux-android%ANDROID_API%-clang"
@set TRIPLE=aarch64-linux-android @set TRIPLE=aarch64-linux-android
@set FL=arm64-v8a @set FL=arm64-v8a
@set GOARCH=arm64 @set GOARCH=arm64
@CALL:COMPILE ) @CALL:COMPILE )
@IF %TARGET_ARCH% == "x86" ( @IF %TARGET_ARCH% == "x86" (
@set CC="armv7a-linux-androideabi%ANDROID_API%-clang" @set CC="i686-linux-android%ANDROID_API%-clang"
@set TRIPLE=i686-linux-android @set TRIPLE=i686-linux-android
@set FL=x86 @set FL=x86
@set GOARCH=arm @set GOARCH=386
@CALL:COMPILE ) @CALL:COMPILE )
@IF %TARGET_ARCH% == "x86_64" ( @IF %TARGET_ARCH% == "x86_64" (
@set CC="armv7a-linux-androideabi%ANDROID_API%-clang" @set CC="x86_64-linux-android%ANDROID_API%-clang"
@set TRIPLE=x86_64-linux-android @set TRIPLE=x86_64-linux-android
@set FL=x86_64 @set FL=x86_64
@set GOARCH=arm64 @set GOARCH=amd64
@CALL:COMPILE ) @CALL:COMPILE )
@EXIT /B @EXIT /B

View file

@ -517,6 +517,16 @@ const char *GetClipboardText(void)
return NULL; return NULL;
} }
// Get clipboard image
Image GetClipboardImage(void)
{
Image image = { 0 };
TRACELOG(LOG_WARNING, "GetClipboardImage() not implemented on target platform");
return image;
}
// Show mouse cursor // Show mouse cursor
void ShowCursor(void) void ShowCursor(void)
{ {