From bbcfaff705a4bce767d7dbbc1bcc6d8785cbd75b Mon Sep 17 00:00:00 2001 From: Shinovon Date: Sun, 1 Jun 2025 06:37:06 +0500 Subject: [PATCH] Symbian: fix running on s60v3 --- misc/symbian/ClassiCube_common.mmh | 1 - misc/symbian/ClassiCube_s60v5.mmp | 4 ++++ misc/symbian/ClassiCube_sym3.mmp | 4 ++++ src/Core.h | 6 +++--- src/Platform_Symbian.cpp | 6 +++--- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/misc/symbian/ClassiCube_common.mmh b/misc/symbian/ClassiCube_common.mmh index 44011e386..7e49be903 100644 --- a/misc/symbian/ClassiCube_common.mmh +++ b/misc/symbian/ClassiCube_common.mmh @@ -36,7 +36,6 @@ LIBRARY libpthread.lib STATICLIBRARY libcrt0.lib #ifdef ARMCC -ALWAYS_BUILD_AS_ARM OPTION ARMCC -Otime --diag_suppress 1296 --diag_suppress 1293 --diag_suppress 66 OPTION_REPLACE ARMCC --cpu 6 OPTION_REPLACE ARMCC --fpu softvfp+vfpv2 --fpmode fast diff --git a/misc/symbian/ClassiCube_s60v5.mmp b/misc/symbian/ClassiCube_s60v5.mmp index 7f2db5d7d..2ef3d8ffa 100644 --- a/misc/symbian/ClassiCube_s60v5.mmp +++ b/misc/symbian/ClassiCube_s60v5.mmp @@ -4,6 +4,10 @@ MACRO CC_BUILD_SYMBIAN_S60V5 ARMFPU softvfp +#ifdef ARMCC +ALWAYS_BUILD_AS_ARM +#endif + LIBRARY libgles_cm.lib SOURCEPATH . diff --git a/misc/symbian/ClassiCube_sym3.mmp b/misc/symbian/ClassiCube_sym3.mmp index 123bd0ef8..9e1ccc74d 100644 --- a/misc/symbian/ClassiCube_sym3.mmp +++ b/misc/symbian/ClassiCube_sym3.mmp @@ -5,6 +5,10 @@ MACRO CC_BUILD_SYMBIAN_LIBGLESV2 ARMFPU vfpv2 +#ifdef ARMCC +ALWAYS_BUILD_AS_ARM +#endif + LIBRARY libglesv2.lib LIBRARY libegl.lib diff --git a/src/Core.h b/src/Core.h index cf4d660a3..22c099b59 100644 --- a/src/Core.h +++ b/src/Core.h @@ -560,14 +560,14 @@ typedef cc_uint8 cc_bool; #define CC_BUILD_EGL #define CC_BUILD_MAXSTACK (16 * 1024) #define CC_BUILD_LOWMEM - #define CC_BUILD_NOMUSIC + #define CC_BUILD_NOMUSIC #define CC_BUILD_NOSOUNDS #define DEFAULT_NET_BACKEND CC_NET_BACKEND_BUILTIN #define DEFAULT_SSL_BACKEND CC_SSL_BACKEND_BEARSSL #if defined CC_BUILD_SYMBIAN_LIBGLESV2 -#define DEFAULT_GFX_BACKEND CC_GFX_BACKEND_GL2 + #define DEFAULT_GFX_BACKEND CC_GFX_BACKEND_GL2 #else -#define DEFAULT_GFX_BACKEND CC_GFX_BACKEND_GL1 + #define DEFAULT_GFX_BACKEND CC_GFX_BACKEND_GL1 #endif #if defined CC_BUILD_SYMBIAN_3 || defined CC_BUILD_SYMBIAN_S60V5 diff --git a/src/Platform_Symbian.cpp b/src/Platform_Symbian.cpp index f394d7a68..c26c1f676 100644 --- a/src/Platform_Symbian.cpp +++ b/src/Platform_Symbian.cpp @@ -303,9 +303,9 @@ void Thread_Run(void** handle, Thread_StartFunc func, int stackSize, const char* *handle = ptr; pthread_attr_init(&attrs); - /* Symbian only supports up to 64 KB stack size */ - if (stackSize >= 64 * 1024) { - stackSize = 64 * 1024; + /* Symbian only supports up to 80 KB stack size */ + if (stackSize >= 80 * 1024) { + stackSize = 80 * 1024; } pthread_attr_setstacksize(&attrs, stackSize);