AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-13 17:47:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Android: Fix not being built with -fno-math-errno

Browse Source
This commit is contained in:
UnknownShadow200 2025-05-25 08:44:05 +10:00
parent 6a0291a9ab
commit 4ea384e8b9
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/build_android.yml vendored
View File

@ -34,7 +34,7 @@ jobs:
id: compile id: compile
env: env:
COMMON_FLAGS: "-O1 -s -fno-stack-protector -fno-math-errno -Qn -Werror" COMMON_FLAGS: "-O1 -s -fno-stack-protector -fno-math-errno -Qn -Werror"
DROID_FLAGS: "-fPIC -shared -s -O1 -fvisibility=hidden -rdynamic -funwind-tables" DROID_FLAGS: "-fPIC -shared -fvisibility=hidden -rdynamic -funwind-tables"
DROID_LIBS: "-lGLESv2 -lEGL -lm -landroid -llog" DROID_LIBS: "-lGLESv2 -lEGL -lm -landroid -llog"
run: | run: |
LATEST_FLAG=-DCC_COMMIT_SHA=\"${GITHUB_SHA::9}\" LATEST_FLAG=-DCC_COMMIT_SHA=\"${GITHUB_SHA::9}\"
@ -48,11 +48,11 @@ jobs:
SDK_ROOT="/opt/android-sdk-linux/platforms/android-34" SDK_ROOT="/opt/android-sdk-linux/platforms/android-34"
cd $ROOT_DIR/src cd $ROOT_DIR/src
$NDK_ROOT/armv7a-linux-androideabi19-clang *.c $DROID_FLAGS -march=armv5 -rtlib=libgcc -L $ROOT_DIR/build-tools/runtime $DROID_LIBS $LATEST_FLAG -o cc-droid-arm_16 $NDK_ROOT/armv7a-linux-androideabi19-clang *.c $COMMON_FLAGS $DROID_FLAGS -march=armv5 -rtlib=libgcc -L $ROOT_DIR/build-tools/runtime $DROID_LIBS $LATEST_FLAG -o cc-droid-arm_16
$NDK_ROOT/armv7a-linux-androideabi19-clang *.c $DROID_FLAGS $DROID_LIBS $LATEST_FLAG -o cc-droid-arm_32 $NDK_ROOT/armv7a-linux-androideabi19-clang *.c $COMMON_FLAGS $DROID_FLAGS $DROID_LIBS $LATEST_FLAG -o cc-droid-arm_32
$NDK_ROOT/aarch64-linux-android21-clang *.c $DROID_FLAGS $DROID_LIBS $LATEST_FLAG -o cc-droid-arm_64 $NDK_ROOT/aarch64-linux-android21-clang *.c $COMMON_FLAGS $DROID_FLAGS $DROID_LIBS $LATEST_FLAG -o cc-droid-arm_64
$NDK_ROOT/i686-linux-android21-clang *.c $DROID_FLAGS $DROID_LIBS $LATEST_FLAG -o cc-droid-x86_32 $NDK_ROOT/i686-linux-android21-clang *.c $COMMON_FLAGS $DROID_FLAGS $DROID_LIBS $LATEST_FLAG -o cc-droid-x86_32
$NDK_ROOT/x86_64-linux-android21-clang *.c $DROID_FLAGS $DROID_LIBS $LATEST_FLAG -o cc-droid-x86_64 $NDK_ROOT/x86_64-linux-android21-clang *.c $COMMON_FLAGS $DROID_FLAGS $DROID_LIBS $LATEST_FLAG -o cc-droid-x86_64
cd $ROOT_DIR/android/app/src/main cd $ROOT_DIR/android/app/src/main
# copy required native libraries # copy required native libraries

2
src/Http_Worker.c
View File

@ -1086,7 +1086,7 @@ static cc_result HttpBackend_Do(struct HttpRequest* req, cc_string* url) {
Http_AddHeader(req, "User-Agent", Http_GetUserAgent_UNSAFE()); Http_AddHeader(req, "User-Agent", Http_GetUserAgent_UNSAFE());
if (req->data) { if (req->data) {
if (res = Http_SetData(env, req)) return res; if ((res = Http_SetData(env, req))) return res;
HttpRequest_Free(req); HttpRequest_Free(req);
} }

2
src/Platform_Posix.c
View File

@ -458,7 +458,7 @@ void Thread_Run(void** handle, Thread_StartFunc func, int stackSize, const char*
extern int pthread_set_name_np(pthread_t thread, const char* name); extern int pthread_set_name_np(pthread_t thread, const char* name);
pthread_set_name_np(*ptr, name); pthread_set_name_np(*ptr, name);
#elif defined CC_BUILD_NETBSD #elif defined CC_BUILD_NETBSD
pthread_setname_np(*ptr, "%s", name); pthread_setname_np(*ptr, "%s", (void*)name);
#endif #endif
} }