AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-14 01:55:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Slightly reduce memory on PS1/N64 consoles, avoid creating plugins folder on any console

Browse Source 
Also slightly tidy up some defines
This commit is contained in:
UnknownShadow200 2024-04-02 21:55:57 +11:00
parent 290252767f
commit d056f8c2ff
4 changed files with 80 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
src/Core.h
View File

@ -121,33 +121,31 @@ typedef cc_uint8 cc_bool;
#define CC_BUILD_NETWORKING #define CC_BUILD_NETWORKING
#define CC_BUILD_FREETYPE #define CC_BUILD_FREETYPE
#define CC_BUILD_RESOURCES #define CC_BUILD_RESOURCES
#define CC_BUILD_PLUGINS
/*#define CC_BUILD_GL11*/ /*#define CC_BUILD_GL11*/
#ifndef CC_BUILD_MANUAL #ifndef CC_BUILD_MANUAL
#if defined NXDK #if defined NXDK
/* XBox also defines _WIN32 */ /* XBox also defines _WIN32 */
#define CC_BUILD_XBOX #define CC_BUILD_XBOX
#define CC_BUILD_CONSOLE
#define CC_BUILD_LOWMEM
#define CC_BUILD_NOMUSIC #define CC_BUILD_NOMUSIC
#define CC_BUILD_NOSOUNDS #define CC_BUILD_NOSOUNDS
#define CC_BUILD_HTTPCLIENT #define CC_BUILD_HTTPCLIENT
#define CC_BUILD_BEARSSL #define CC_BUILD_BEARSSL
#define CC_BUILD_LOWMEM
#define CC_BUILD_CONSOLE
#undef CC_BUILD_FREETYPE
#elif defined XENON #elif defined XENON
/* libxenon also defines __linux__ (yes, really) */ /* libxenon also defines __linux__ (yes, really) */
#define CC_BUILD_XBOX360 #define CC_BUILD_XBOX360
#define CC_BUILD_CONSOLE
#define CC_BUILD_LOWMEM
#define CC_BUILD_NOMUSIC #define CC_BUILD_NOMUSIC
#define CC_BUILD_NOSOUNDS #define CC_BUILD_NOSOUNDS
#define CC_BUILD_HTTPCLIENT #define CC_BUILD_HTTPCLIENT
#define CC_BUILD_LOWMEM
#define CC_BUILD_CONSOLE
#undef CC_BUILD_FREETYPE
#elif defined _WIN32 #elif defined _WIN32
#define CC_BUILD_WIN #define CC_BUILD_WIN
#define CC_BUILD_D3D9 #define CC_BUILD_D3D9
#define CC_BUILD_WINGUI #define CC_BUILD_WINGUI
#define CC_BUILD_HTTPCLIENT
#define CC_BUILD_SCHANNEL #define CC_BUILD_SCHANNEL
#define CC_BUILD_WINMM #define CC_BUILD_WINMM
#elif defined __ANDROID__ #elif defined __ANDROID__
@ -267,122 +265,113 @@ typedef cc_uint8 cc_bool;
#define CC_BUILD_COOPTHREADED #define CC_BUILD_COOPTHREADED
#undef CC_BUILD_FREETYPE #undef CC_BUILD_FREETYPE
#undef CC_BUILD_RESOURCES #undef CC_BUILD_RESOURCES
#undef CC_BUILD_PLUGINS
#elif defined __psp__ #elif defined __psp__
#define CC_BUILD_PSP #define CC_BUILD_PSP
#define CC_BUILD_CONSOLE
#define CC_BUILD_LOWMEM
#define CC_BUILD_COOPTHREADED
#define CC_BUILD_OPENAL #define CC_BUILD_OPENAL
#define CC_BUILD_HTTPCLIENT #define CC_BUILD_HTTPCLIENT
#define CC_BUILD_COOPTHREADED
#define CC_BUILD_BEARSSL #define CC_BUILD_BEARSSL
#define CC_BUILD_LOWMEM
#define CC_BUILD_CONSOLE
#undef CC_BUILD_FREETYPE
#elif defined __3DS__ #elif defined __3DS__
#define CC_BUILD_3DS #define CC_BUILD_3DS
#define CC_BUILD_CONSOLE
#define CC_BUILD_LOWMEM
#define CC_BUILD_HTTPCLIENT #define CC_BUILD_HTTPCLIENT
#define CC_BUILD_BEARSSL #define CC_BUILD_BEARSSL
#define CC_BUILD_LOWMEM
#define CC_BUILD_CONSOLE
#define CC_BUILD_TOUCH #define CC_BUILD_TOUCH
#define CC_BUILD_DUALSCREEN #define CC_BUILD_DUALSCREEN
#undef CC_BUILD_FREETYPE
#elif defined GEKKO #elif defined GEKKO
#define CC_BUILD_GCWII #define CC_BUILD_GCWII
#define CC_BUILD_CONSOLE
#define CC_BUILD_LOWMEM
#define CC_BUILD_COOPTHREADED
#define CC_BUILD_HTTPCLIENT #define CC_BUILD_HTTPCLIENT
#define CC_BUILD_BEARSSL #define CC_BUILD_BEARSSL
#define CC_BUILD_COOPTHREADED
#define CC_BUILD_LOWMEM
#define CC_BUILD_CONSOLE
#undef CC_BUILD_FREETYPE
#elif defined __vita__ #elif defined __vita__
#define CC_BUILD_PSVITA #define CC_BUILD_PSVITA
#define CC_BUILD_CONSOLE
#define CC_BUILD_LOWMEM
#define CC_BUILD_OPENAL #define CC_BUILD_OPENAL
#define CC_BUILD_HTTPCLIENT #define CC_BUILD_HTTPCLIENT
#define CC_BUILD_BEARSSL #define CC_BUILD_BEARSSL
#define CC_BUILD_LOWMEM
#define CC_BUILD_CONSOLE
#define CC_BUILD_TOUCH #define CC_BUILD_TOUCH
#undef CC_BUILD_FREETYPE
#elif defined _arch_dreamcast #elif defined _arch_dreamcast
#define CC_BUILD_DREAMCAST #define CC_BUILD_DREAMCAST
#define CC_BUILD_CONSOLE
#define CC_BUILD_LOWMEM
#define CC_BUILD_OPENAL #define CC_BUILD_OPENAL
#define CC_BUILD_HTTPCLIENT #define CC_BUILD_HTTPCLIENT
#define CC_BUILD_BEARSSL #define CC_BUILD_BEARSSL
#define CC_BUILD_LOWMEM
#define CC_BUILD_CONSOLE
#undef CC_BUILD_FREETYPE
#undef CC_BUILD_RESOURCES #undef CC_BUILD_RESOURCES
#elif defined PLAT_PS3 #elif defined PLAT_PS3
#define CC_BUILD_PS3 #define CC_BUILD_PS3
#define CC_BUILD_CONSOLE
#define CC_BUILD_LOWMEM
#define CC_BUILD_OPENAL #define CC_BUILD_OPENAL
#define CC_BUILD_HTTPCLIENT #define CC_BUILD_HTTPCLIENT
#define CC_BUILD_LOWMEM
#define CC_BUILD_CONSOLE
#define CC_BUILD_BEARSSL #define CC_BUILD_BEARSSL
#undef CC_BUILD_FREETYPE
#elif defined N64 #elif defined N64
#define CC_BIG_ENDIAN #define CC_BIG_ENDIAN
#define CC_BUILD_N64 #define CC_BUILD_N64
#define CC_BUILD_OPENAL
#define CC_BUILD_HTTPCLIENT
#define CC_BUILD_COOPTHREADED
#define CC_BUILD_LOWMEM
#define CC_BUILD_CONSOLE #define CC_BUILD_CONSOLE
#undef CC_BUILD_FREETYPE #define CC_BUILD_LOWMEM
#define CC_BUILD_COOPTHREADED
#define CC_BUILD_OPENAL
#undef CC_BUILD_RESOURCES #undef CC_BUILD_RESOURCES
#undef CC_BUILD_NETWORKING #undef CC_BUILD_NETWORKING
#elif defined PLAT_PS2 #elif defined PLAT_PS2
#define CC_BUILD_PS2 #define CC_BUILD_PS2
#define CC_BUILD_CONSOLE
#define CC_BUILD_LOWMEM
#define CC_BUILD_COOPTHREADED
#define CC_BUILD_OPENAL #define CC_BUILD_OPENAL
#define CC_BUILD_HTTPCLIENT #define CC_BUILD_HTTPCLIENT
#define CC_BUILD_COOPTHREADED
#define CC_BUILD_LOWMEM
#define CC_BUILD_CONSOLE
#undef CC_BUILD_FREETYPE
#elif defined PLAT_NDS #elif defined PLAT_NDS
#define CC_BUILD_NDS #define CC_BUILD_NDS
#define CC_BUILD_CONSOLE
#define CC_BUILD_LOWMEM
#define CC_BUILD_COOPTHREADED
#define CC_BUILD_NOMUSIC #define CC_BUILD_NOMUSIC
#define CC_BUILD_NOSOUNDS #define CC_BUILD_NOSOUNDS
#define CC_BUILD_HTTPCLIENT #define CC_BUILD_HTTPCLIENT
#define CC_BUILD_COOPTHREADED
#define CC_BUILD_LOWMEM
#define CC_BUILD_CONSOLE
#define CC_BUILD_TOUCH #define CC_BUILD_TOUCH
#undef CC_BUILD_FREETYPE
#undef CC_BUILD_RESOURCES #undef CC_BUILD_RESOURCES
#elif defined __WIIU__ #elif defined __WIIU__
#define CC_BUILD_WIIU #define CC_BUILD_WIIU
#define CC_BUILD_CONSOLE
#define CC_BUILD_LOWMEM
#define CC_BUILD_COOPTHREADED
#define CC_BUILD_OPENAL #define CC_BUILD_OPENAL
#define CC_BUILD_HTTPCLIENT #define CC_BUILD_HTTPCLIENT
#define CC_BUILD_COOPTHREADED
#define CC_BUILD_LOWMEM
#define CC_BUILD_CONSOLE
#define CC_BUILD_BEARSSL #define CC_BUILD_BEARSSL
#undef CC_BUILD_FREETYPE
#elif defined __SWITCH__ #elif defined __SWITCH__
#define CC_BUILD_SWITCH #define CC_BUILD_SWITCH
#define CC_BUILD_CONSOLE
#define CC_BUILD_HTTPCLIENT #define CC_BUILD_HTTPCLIENT
#define CC_BUILD_BEARSSL #define CC_BUILD_BEARSSL
#define CC_BUILD_CONSOLE
#define CC_BUILD_TOUCH #define CC_BUILD_TOUCH
#define CC_BUILD_GL #define CC_BUILD_GL
#define CC_BUILD_GLMODERN #define CC_BUILD_GLMODERN
#define CC_BUILD_GLES #define CC_BUILD_GLES
#define CC_BUILD_EGL #define CC_BUILD_EGL
#undef CC_BUILD_FREETYPE
#elif defined PLAT_PS1 #elif defined PLAT_PS1
#define CC_BUILD_PS1 #define CC_BUILD_PS1
#define CC_BUILD_HTTPCLIENT
#define CC_BUILD_COOPTHREADED
#define CC_BUILD_LOWMEM
#define CC_BUILD_CONSOLE #define CC_BUILD_CONSOLE
#define CC_BUILD_LOWMEM
#define CC_BUILD_COOPTHREADED
#define CC_BUILD_NOMUSIC #define CC_BUILD_NOMUSIC
#define CC_BUILD_NOSOUNDS #define CC_BUILD_NOSOUNDS
#undef CC_BUILD_FREETYPE
#undef CC_BUILD_RESOURCES #undef CC_BUILD_RESOURCES
#undef CC_BUILD_NETWORKING #undef CC_BUILD_NETWORKING
#endif #endif
#endif #endif
#ifdef CC_BUILD_CONSOLE
#undef CC_BUILD_FREETYPE
#undef CC_BUILD_PLUGINS
#endif
#ifndef CC_BUILD_LOWMEM #ifndef CC_BUILD_LOWMEM
#define EXTENDED_BLOCKS #define EXTENDED_BLOCKS

6
src/Game.c
View File

@ -347,9 +347,7 @@ static void LoadOptions(void) {
Game_Anaglyph3D = Options_GetBool(OPT_ANAGLYPH3D, false); Game_Anaglyph3D = Options_GetBool(OPT_ANAGLYPH3D, false);
} }
#ifdef CC_BUILD_MINFILES #ifdef CC_BUILD_PLUGINS
static void LoadPlugins(void) { }
#else
static void LoadPlugin(const cc_string* path, void* obj) { static void LoadPlugin(const cc_string* path, void* obj) {
void* lib; void* lib;
void* verSym; /* EXPORT int Plugin_ApiVersion = GAME_API_VER; */ void* verSym; /* EXPORT int Plugin_ApiVersion = GAME_API_VER; */
@ -390,6 +388,8 @@ static void LoadPlugins(void) {
res = Directory_Enum(&dir, NULL, LoadPlugin); res = Directory_Enum(&dir, NULL, LoadPlugin);
if (res) Logger_SysWarn(res, "enumerating plugins directory"); if (res) Logger_SysWarn(res, "enumerating plugins directory");
} }
#else
static void LoadPlugins(void) { }
#endif #endif
static void Game_Free(void* obj); static void Game_Free(void* obj);

18
src/Http_Worker.c
View File

@ -1155,6 +1155,24 @@ static cc_result HttpBackend_Do(struct HttpRequest* req, cc_string* url) {
CFRelease(request); CFRelease(request);
return result; return result;
} }
#elif !defined CC_BUILD_NETWORKING
/*########################################################################################################################*
*------------------------------------------------------Null backend-------------------------------------------------------*
*#########################################################################################################################*/
#include "Errors.h"
static cc_bool HttpBackend_DescribeError(cc_result res, cc_string* dst) {
return false;
}
static void HttpBackend_Init(void) { }
static void Http_AddHeader(struct HttpRequest* req, const char* key, const cc_string* value) { }
static cc_result HttpBackend_Do(struct HttpRequest* req, cc_string* url) {
req->progress = 100;
return ERR_NOT_SUPPORTED;
}
#endif #endif

38
src/Logger.c
View File

@ -8,35 +8,35 @@
#include "Utils.h" #include "Utils.h"
#if defined CC_BUILD_WEB #if defined CC_BUILD_WEB
/* Can't see native CPU state with javascript */ /* Can't see native CPU state with javascript */
#elif defined CC_BUILD_WIN #elif defined CC_BUILD_WIN
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#define NOSERVICE #define NOSERVICE
#define NOMCX #define NOMCX
#define NOIME #define NOIME
#define CUR_PROCESS_HANDLE ((HANDLE)-1) /* GetCurrentProcess() always returns -1 */ #define CUR_PROCESS_HANDLE ((HANDLE)-1) /* GetCurrentProcess() always returns -1 */
#include <windows.h> #include <windows.h>
#include <imagehlp.h> #include <imagehlp.h>
static HANDLE curProcess = CUR_PROCESS_HANDLE; static HANDLE curProcess = CUR_PROCESS_HANDLE;
#elif defined CC_BUILD_OPENBSD || defined CC_BUILD_HAIKU || defined CC_BUILD_SERENITY #elif defined CC_BUILD_OPENBSD || defined CC_BUILD_HAIKU || defined CC_BUILD_SERENITY
#include <signal.h> #include <signal.h>
/* These operating systems don't provide sys/ucontext.h */ /* These operating systems don't provide sys/ucontext.h */
/* But register constants be found from includes in <signal.h> */ /* But register constants be found from includes in <signal.h> */
#elif defined CC_BUILD_LINUX || defined CC_BUILD_ANDROID #elif defined CC_BUILD_LINUX || defined CC_BUILD_ANDROID
/* Need to define this to get REG_ constants */ /* Need to define this to get REG_ constants */
#define _GNU_SOURCE #define _GNU_SOURCE
#include <sys/ucontext.h> #include <sys/ucontext.h>
#include <signal.h> #include <signal.h>
#elif defined CC_BUILD_POSIX #elif defined CC_BUILD_POSIX
#include <signal.h> #include <signal.h>
#include <sys/ucontext.h> #include <sys/ucontext.h>
#endif #endif
#ifdef CC_BUILD_DARWIN #ifdef CC_BUILD_DARWIN
/* Need this to detect macOS < 10.4, and switch to NS* api instead if so */ /* Need this to detect macOS < 10.4, and switch to NS* api instead if so */
#include <AvailabilityMacros.h> #include <AvailabilityMacros.h>
#endif #endif
/* Only show up to 50 frames in backtrace */ /* Only show up to 50 frames in backtrace */
#define MAX_BACKTRACE_FRAMES 50 #define MAX_BACKTRACE_FRAMES 50