diff --git a/src/Core.h b/src/Core.h index 20bb0d740..d66ca7c16 100644 --- a/src/Core.h +++ b/src/Core.h @@ -121,33 +121,31 @@ typedef cc_uint8 cc_bool; #define CC_BUILD_NETWORKING #define CC_BUILD_FREETYPE #define CC_BUILD_RESOURCES +#define CC_BUILD_PLUGINS /*#define CC_BUILD_GL11*/ #ifndef CC_BUILD_MANUAL #if defined NXDK /* XBox also defines _WIN32 */ #define CC_BUILD_XBOX + #define CC_BUILD_CONSOLE + #define CC_BUILD_LOWMEM #define CC_BUILD_NOMUSIC #define CC_BUILD_NOSOUNDS #define CC_BUILD_HTTPCLIENT #define CC_BUILD_BEARSSL - #define CC_BUILD_LOWMEM - #define CC_BUILD_CONSOLE - #undef CC_BUILD_FREETYPE #elif defined XENON /* libxenon also defines __linux__ (yes, really) */ #define CC_BUILD_XBOX360 + #define CC_BUILD_CONSOLE + #define CC_BUILD_LOWMEM #define CC_BUILD_NOMUSIC #define CC_BUILD_NOSOUNDS #define CC_BUILD_HTTPCLIENT - #define CC_BUILD_LOWMEM - #define CC_BUILD_CONSOLE - #undef CC_BUILD_FREETYPE #elif defined _WIN32 #define CC_BUILD_WIN #define CC_BUILD_D3D9 #define CC_BUILD_WINGUI - #define CC_BUILD_HTTPCLIENT #define CC_BUILD_SCHANNEL #define CC_BUILD_WINMM #elif defined __ANDROID__ @@ -267,122 +265,113 @@ typedef cc_uint8 cc_bool; #define CC_BUILD_COOPTHREADED #undef CC_BUILD_FREETYPE #undef CC_BUILD_RESOURCES + #undef CC_BUILD_PLUGINS #elif defined __psp__ #define CC_BUILD_PSP + #define CC_BUILD_CONSOLE + #define CC_BUILD_LOWMEM + #define CC_BUILD_COOPTHREADED #define CC_BUILD_OPENAL #define CC_BUILD_HTTPCLIENT - #define CC_BUILD_COOPTHREADED #define CC_BUILD_BEARSSL - #define CC_BUILD_LOWMEM - #define CC_BUILD_CONSOLE - #undef CC_BUILD_FREETYPE #elif defined __3DS__ #define CC_BUILD_3DS + #define CC_BUILD_CONSOLE + #define CC_BUILD_LOWMEM #define CC_BUILD_HTTPCLIENT #define CC_BUILD_BEARSSL - #define CC_BUILD_LOWMEM - #define CC_BUILD_CONSOLE #define CC_BUILD_TOUCH #define CC_BUILD_DUALSCREEN - #undef CC_BUILD_FREETYPE #elif defined GEKKO #define CC_BUILD_GCWII + #define CC_BUILD_CONSOLE + #define CC_BUILD_LOWMEM + #define CC_BUILD_COOPTHREADED #define CC_BUILD_HTTPCLIENT #define CC_BUILD_BEARSSL - #define CC_BUILD_COOPTHREADED - #define CC_BUILD_LOWMEM - #define CC_BUILD_CONSOLE - #undef CC_BUILD_FREETYPE #elif defined __vita__ #define CC_BUILD_PSVITA + #define CC_BUILD_CONSOLE + #define CC_BUILD_LOWMEM #define CC_BUILD_OPENAL #define CC_BUILD_HTTPCLIENT #define CC_BUILD_BEARSSL - #define CC_BUILD_LOWMEM - #define CC_BUILD_CONSOLE #define CC_BUILD_TOUCH - #undef CC_BUILD_FREETYPE #elif defined _arch_dreamcast #define CC_BUILD_DREAMCAST + #define CC_BUILD_CONSOLE + #define CC_BUILD_LOWMEM #define CC_BUILD_OPENAL #define CC_BUILD_HTTPCLIENT #define CC_BUILD_BEARSSL - #define CC_BUILD_LOWMEM - #define CC_BUILD_CONSOLE - #undef CC_BUILD_FREETYPE #undef CC_BUILD_RESOURCES #elif defined PLAT_PS3 #define CC_BUILD_PS3 + #define CC_BUILD_CONSOLE + #define CC_BUILD_LOWMEM #define CC_BUILD_OPENAL #define CC_BUILD_HTTPCLIENT - #define CC_BUILD_LOWMEM - #define CC_BUILD_CONSOLE #define CC_BUILD_BEARSSL - #undef CC_BUILD_FREETYPE #elif defined N64 #define CC_BIG_ENDIAN #define CC_BUILD_N64 - #define CC_BUILD_OPENAL - #define CC_BUILD_HTTPCLIENT - #define CC_BUILD_COOPTHREADED - #define CC_BUILD_LOWMEM #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_NETWORKING #elif defined PLAT_PS2 #define CC_BUILD_PS2 + #define CC_BUILD_CONSOLE + #define CC_BUILD_LOWMEM + #define CC_BUILD_COOPTHREADED #define CC_BUILD_OPENAL #define CC_BUILD_HTTPCLIENT - #define CC_BUILD_COOPTHREADED - #define CC_BUILD_LOWMEM - #define CC_BUILD_CONSOLE - #undef CC_BUILD_FREETYPE #elif defined PLAT_NDS #define CC_BUILD_NDS + #define CC_BUILD_CONSOLE + #define CC_BUILD_LOWMEM + #define CC_BUILD_COOPTHREADED #define CC_BUILD_NOMUSIC #define CC_BUILD_NOSOUNDS #define CC_BUILD_HTTPCLIENT - #define CC_BUILD_COOPTHREADED - #define CC_BUILD_LOWMEM - #define CC_BUILD_CONSOLE #define CC_BUILD_TOUCH - #undef CC_BUILD_FREETYPE #undef CC_BUILD_RESOURCES #elif defined __WIIU__ #define CC_BUILD_WIIU + #define CC_BUILD_CONSOLE + #define CC_BUILD_LOWMEM + #define CC_BUILD_COOPTHREADED #define CC_BUILD_OPENAL #define CC_BUILD_HTTPCLIENT - #define CC_BUILD_COOPTHREADED - #define CC_BUILD_LOWMEM - #define CC_BUILD_CONSOLE #define CC_BUILD_BEARSSL - #undef CC_BUILD_FREETYPE #elif defined __SWITCH__ #define CC_BUILD_SWITCH + #define CC_BUILD_CONSOLE #define CC_BUILD_HTTPCLIENT #define CC_BUILD_BEARSSL - #define CC_BUILD_CONSOLE #define CC_BUILD_TOUCH #define CC_BUILD_GL #define CC_BUILD_GLMODERN #define CC_BUILD_GLES #define CC_BUILD_EGL - #undef CC_BUILD_FREETYPE #elif defined PLAT_PS1 #define CC_BUILD_PS1 - #define CC_BUILD_HTTPCLIENT - #define CC_BUILD_COOPTHREADED - #define CC_BUILD_LOWMEM #define CC_BUILD_CONSOLE + #define CC_BUILD_LOWMEM + #define CC_BUILD_COOPTHREADED #define CC_BUILD_NOMUSIC #define CC_BUILD_NOSOUNDS - #undef CC_BUILD_FREETYPE #undef CC_BUILD_RESOURCES #undef CC_BUILD_NETWORKING #endif #endif +#ifdef CC_BUILD_CONSOLE +#undef CC_BUILD_FREETYPE +#undef CC_BUILD_PLUGINS +#endif #ifndef CC_BUILD_LOWMEM #define EXTENDED_BLOCKS diff --git a/src/Game.c b/src/Game.c index 14cf3343a..0624b12f9 100644 --- a/src/Game.c +++ b/src/Game.c @@ -347,9 +347,7 @@ static void LoadOptions(void) { Game_Anaglyph3D = Options_GetBool(OPT_ANAGLYPH3D, false); } -#ifdef CC_BUILD_MINFILES -static void LoadPlugins(void) { } -#else +#ifdef CC_BUILD_PLUGINS static void LoadPlugin(const cc_string* path, void* obj) { void* lib; void* verSym; /* EXPORT int Plugin_ApiVersion = GAME_API_VER; */ @@ -390,6 +388,8 @@ static void LoadPlugins(void) { res = Directory_Enum(&dir, NULL, LoadPlugin); if (res) Logger_SysWarn(res, "enumerating plugins directory"); } +#else +static void LoadPlugins(void) { } #endif static void Game_Free(void* obj); diff --git a/src/Http_Worker.c b/src/Http_Worker.c index a249bf1ba..5d825513c 100644 --- a/src/Http_Worker.c +++ b/src/Http_Worker.c @@ -1155,6 +1155,24 @@ static cc_result HttpBackend_Do(struct HttpRequest* req, cc_string* url) { CFRelease(request); 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 diff --git a/src/Logger.c b/src/Logger.c index 7bb32070d..5ae5868e2 100644 --- a/src/Logger.c +++ b/src/Logger.c @@ -8,35 +8,35 @@ #include "Utils.h" #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 -#define WIN32_LEAN_AND_MEAN -#define NOSERVICE -#define NOMCX -#define NOIME -#define CUR_PROCESS_HANDLE ((HANDLE)-1) /* GetCurrentProcess() always returns -1 */ - -#include -#include -static HANDLE curProcess = CUR_PROCESS_HANDLE; + #define WIN32_LEAN_AND_MEAN + #define NOSERVICE + #define NOMCX + #define NOIME + #define CUR_PROCESS_HANDLE ((HANDLE)-1) /* GetCurrentProcess() always returns -1 */ + + #include + #include + static HANDLE curProcess = CUR_PROCESS_HANDLE; #elif defined CC_BUILD_OPENBSD || defined CC_BUILD_HAIKU || defined CC_BUILD_SERENITY -#include -/* These operating systems don't provide sys/ucontext.h */ -/* But register constants be found from includes in */ + #include + /* These operating systems don't provide sys/ucontext.h */ + /* But register constants be found from includes in */ #elif defined CC_BUILD_LINUX || defined CC_BUILD_ANDROID -/* Need to define this to get REG_ constants */ -#define _GNU_SOURCE -#include -#include + /* Need to define this to get REG_ constants */ + #define _GNU_SOURCE + #include + #include #elif defined CC_BUILD_POSIX -#include -#include + #include + #include #endif + #ifdef CC_BUILD_DARWIN /* Need this to detect macOS < 10.4, and switch to NS* api instead if so */ #include #endif - /* Only show up to 50 frames in backtrace */ #define MAX_BACKTRACE_FRAMES 50