AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-08-03 18:57:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1377 from shinovon/3

Browse Source 
Symbian: fix running on s60v3
This commit is contained in:
UnknownShadow200 2025-06-01 12:47:27 +10:00 committed by GitHub
commit 9667f5198d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
misc/symbian/ClassiCube_common.mmh
View File

@ -36,7 +36,6 @@ LIBRARY libpthread.lib
STATICLIBRARY libcrt0.lib STATICLIBRARY libcrt0.lib
#ifdef ARMCC #ifdef ARMCC
ALWAYS_BUILD_AS_ARM
OPTION ARMCC -Otime --diag_suppress 1296 --diag_suppress 1293 --diag_suppress 66 OPTION ARMCC -Otime --diag_suppress 1296 --diag_suppress 1293 --diag_suppress 66
OPTION_REPLACE ARMCC --cpu 6 OPTION_REPLACE ARMCC --cpu 6
OPTION_REPLACE ARMCC --fpu softvfp+vfpv2 --fpmode fast OPTION_REPLACE ARMCC --fpu softvfp+vfpv2 --fpmode fast

4
misc/symbian/ClassiCube_s60v5.mmp
View File

@ -4,6 +4,10 @@ MACRO CC_BUILD_SYMBIAN_S60V5
ARMFPU softvfp ARMFPU softvfp
#ifdef ARMCC
ALWAYS_BUILD_AS_ARM
#endif
LIBRARY libgles_cm.lib LIBRARY libgles_cm.lib
SOURCEPATH . SOURCEPATH .

4
misc/symbian/ClassiCube_sym3.mmp
View File

@ -5,6 +5,10 @@ MACRO CC_BUILD_SYMBIAN_LIBGLESV2
ARMFPU vfpv2 ARMFPU vfpv2
#ifdef ARMCC
ALWAYS_BUILD_AS_ARM
#endif
LIBRARY libglesv2.lib LIBRARY libglesv2.lib
LIBRARY libegl.lib LIBRARY libegl.lib

6
src/Core.h
View File

@ -560,14 +560,14 @@ typedef cc_uint8 cc_bool;
#define CC_BUILD_EGL #define CC_BUILD_EGL
#define CC_BUILD_MAXSTACK (16 * 1024) #define CC_BUILD_MAXSTACK (16 * 1024)
#define CC_BUILD_LOWMEM #define CC_BUILD_LOWMEM
#define CC_BUILD_NOMUSIC #define CC_BUILD_NOMUSIC
#define CC_BUILD_NOSOUNDS #define CC_BUILD_NOSOUNDS
#define DEFAULT_NET_BACKEND CC_NET_BACKEND_BUILTIN #define DEFAULT_NET_BACKEND CC_NET_BACKEND_BUILTIN
#define DEFAULT_SSL_BACKEND CC_SSL_BACKEND_BEARSSL #define DEFAULT_SSL_BACKEND CC_SSL_BACKEND_BEARSSL
#if defined CC_BUILD_SYMBIAN_LIBGLESV2 #if defined CC_BUILD_SYMBIAN_LIBGLESV2
#define DEFAULT_GFX_BACKEND CC_GFX_BACKEND_GL2 #define DEFAULT_GFX_BACKEND CC_GFX_BACKEND_GL2
#else #else
#define DEFAULT_GFX_BACKEND CC_GFX_BACKEND_GL1 #define DEFAULT_GFX_BACKEND CC_GFX_BACKEND_GL1
#endif #endif
#if defined CC_BUILD_SYMBIAN_3 || defined CC_BUILD_SYMBIAN_S60V5 #if defined CC_BUILD_SYMBIAN_3 || defined CC_BUILD_SYMBIAN_S60V5

6
src/Platform_Symbian.cpp
View File

@ -303,9 +303,9 @@ void Thread_Run(void** handle, Thread_StartFunc func, int stackSize, const char*
*handle = ptr; *handle = ptr;
pthread_attr_init(&attrs); pthread_attr_init(&attrs);
/* Symbian only supports up to 64 KB stack size */ /* Symbian only supports up to 80 KB stack size */
if (stackSize >= 64 * 1024) { if (stackSize >= 80 * 1024) {
stackSize = 64 * 1024; stackSize = 80 * 1024;
} }
pthread_attr_setstacksize(&attrs, stackSize); pthread_attr_setstacksize(&attrs, stackSize);