diff --git a/src/Core.h b/src/Core.h index 9960018ed..bc00131cc 100644 --- a/src/Core.h +++ b/src/Core.h @@ -119,7 +119,11 @@ typedef cc_uint8 cc_bool; #define CC_BUILD_FREETYPE +#ifndef CC_BUILD_FLATPAK +#define CC_BUILD_RESOURCES +#endif /*#define CC_BUILD_GL11*/ + #ifndef CC_BUILD_MANUAL #if defined NXDK /* XBox also defines _WIN32 */ @@ -267,6 +271,7 @@ typedef cc_uint8 cc_bool; #define CC_BUILD_MINFILES #define CC_BUILD_COOPTHREADED #undef CC_BUILD_FREETYPE + #undef CC_BUILD_RESOURCES #elif defined __psp__ #define CC_BUILD_PSP #define CC_BUILD_OPENAL @@ -307,6 +312,7 @@ typedef cc_uint8 cc_bool; #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_OPENAL @@ -324,6 +330,7 @@ typedef cc_uint8 cc_bool; #define CC_BUILD_LOWMEM #define CC_BUILD_CONSOLE #undef CC_BUILD_FREETYPE + #undef CC_BUILD_RESOURCES #elif defined PLAT_PS2 #define CC_BUILD_PS2 #define CC_BUILD_OPENAL diff --git a/src/LScreens.c b/src/LScreens.c index 8a109801c..02d4502f8 100644 --- a/src/LScreens.c +++ b/src/LScreens.c @@ -980,7 +980,7 @@ void MainScreen_SetActive(void) { } -#ifndef CC_BUILD_FLATPAK +#ifdef CC_BUILD_RESOURCES /*########################################################################################################################* *----------------------------------------------------CheckResourcesScreen-------------------------------------------------* *#########################################################################################################################*/ diff --git a/src/Launcher.c b/src/Launcher.c index 393c2682a..90014fe43 100644 --- a/src/Launcher.c +++ b/src/Launcher.c @@ -256,9 +256,7 @@ void Launcher_Run(void) { Http_Component.Init(); CheckUpdateTask_Run(); -#ifdef CC_BUILD_FLATPAK - MainScreen_SetActive(); -#else +#ifdef CC_BUILD_RESOURCES Resources_CheckExistence(); if (Resources_Count) { @@ -266,6 +264,8 @@ void Launcher_Run(void) { } else { MainScreen_SetActive(); } +#else + MainScreen_SetActive(); #endif for (;;) { diff --git a/src/Resources.c b/src/Resources.c index 6e2375d7f..3ab08fd6a 100644 --- a/src/Resources.c +++ b/src/Resources.c @@ -1,5 +1,5 @@ #include "Resources.h" -#if !defined CC_BUILD_WEB +#ifdef CC_BUILD_RESOURCES #include "Funcs.h" #include "String.h" #include "Constants.h"