From 982641228c6ee5732ae99a9c26895305143b21d9 Mon Sep 17 00:00:00 2001 From: Ray Date: Thu, 19 Oct 2023 13:36:10 +0200 Subject: [PATCH] REDESIGNED: Move platforms to separate directory #3313 --- src/{ => platforms}/rcore_android.c | 0 src/{ => platforms}/rcore_desktop.c | 0 src/{ => platforms}/rcore_desktop_sdl.c | 0 src/{ => platforms}/rcore_drm.c | 0 src/{ => platforms}/rcore_template.c | 0 src/{ => platforms}/rcore_web.c | 0 src/rcore.c | 32 ++++++++++++++++++------- 7 files changed, 23 insertions(+), 9 deletions(-) rename src/{ => platforms}/rcore_android.c (100%) rename src/{ => platforms}/rcore_desktop.c (100%) rename src/{ => platforms}/rcore_desktop_sdl.c (100%) rename src/{ => platforms}/rcore_drm.c (100%) rename src/{ => platforms}/rcore_template.c (100%) rename src/{ => platforms}/rcore_web.c (100%) diff --git a/src/rcore_android.c b/src/platforms/rcore_android.c similarity index 100% rename from src/rcore_android.c rename to src/platforms/rcore_android.c diff --git a/src/rcore_desktop.c b/src/platforms/rcore_desktop.c similarity index 100% rename from src/rcore_desktop.c rename to src/platforms/rcore_desktop.c diff --git a/src/rcore_desktop_sdl.c b/src/platforms/rcore_desktop_sdl.c similarity index 100% rename from src/rcore_desktop_sdl.c rename to src/platforms/rcore_desktop_sdl.c diff --git a/src/rcore_drm.c b/src/platforms/rcore_drm.c similarity index 100% rename from src/rcore_drm.c rename to src/platforms/rcore_drm.c diff --git a/src/rcore_template.c b/src/platforms/rcore_template.c similarity index 100% rename from src/rcore_template.c rename to src/platforms/rcore_template.c diff --git a/src/rcore_web.c b/src/platforms/rcore_web.c similarity index 100% rename from src/rcore_web.c rename to src/platforms/rcore_web.c diff --git a/src/rcore.c b/src/rcore.c index c6770a5bb..fd0335c6e 100644 --- a/src/rcore.c +++ b/src/rcore.c @@ -281,8 +281,8 @@ extern void LoadFontDefault(void); // [Module: text] Loads default font on extern void UnloadFontDefault(void); // [Module: text] Unloads default font from GPU memory #endif -static int InitPlatform(void); // Initialize platform (graphics, inputs and more) -static void ClosePlatform(void); // Close platform +extern int InitPlatform(void); // Initialize platform (graphics, inputs and more) +extern void ClosePlatform(void); // Close platform static void InitTimer(void); // Initialize timer (hi-resolution if available) static void SetupFramebuffer(int width, int height); // Setup main framebuffer @@ -309,15 +309,15 @@ const char *TextFormat(const char *text, ...); // Formatting of text with // Include platform-specific submodules #if defined(PLATFORM_DESKTOP) - #include "rcore_desktop.c" + #include "platforms/rcore_desktop.c" #elif defined(PLATFORM_DESKTOP_SDL) - #include "rcore_desktop_sdl.c" + #include "platforms/rcore_desktop_sdl.c" #elif defined(PLATFORM_WEB) - #include "rcore_web.c" + #include "platforms/rcore_web.c" #elif defined(PLATFORM_DRM) - #include "rcore_drm.c" + #include "platforms/rcore_drm.c" #elif defined(PLATFORM_ANDROID) - #include "rcore_android.c" + #include "platforms/rcore_android.c" #else // TODO: Include your custom platform backend! // i.e software rendering backend or console backend! @@ -328,8 +328,6 @@ const char *TextFormat(const char *text, ...); // Formatting of text with //---------------------------------------------------------------------------------- // NOTE: Functions with a platform-specific implementation on rcore_.c -//void InitWindow(int width, int height, const char *title) -//void CloseWindow(void) //bool WindowShouldClose(void) //void ToggleFullscreen(void) //void ToggleBorderlessWindowed(void) @@ -378,6 +376,22 @@ void InitWindow(int width, int height, const char *title) { TRACELOG(LOG_INFO, "Initializing raylib %s", RAYLIB_VERSION); +#if defined(PLATFORM_DESKTOP) + TRACELOG(LOG_INFO, "Platform backend: DESKTOP (GLFW)"); +#elif defined(PLATFORM_DESKTOP_SDL) + TRACELOG(LOG_INFO, "Platform backend: DESKTOP (SDL)"); +#elif defined(PLATFORM_WEB) + TRACELOG(LOG_INFO, "Platform backend: WEB (HTML5)"); +#elif defined(PLATFORM_DRM) + TRACELOG(LOG_INFO, "Platform backend: NATIVE DRM"); +#elif defined(PLATFORM_ANDROID) + TRACELOG(LOG_INFO, "Platform backend: ANDROID"); +#else + // TODO: Include your custom platform backend! + // i.e software rendering backend or console backend! + TRACELOG(LOG_INFO, "Platform backend: CUSTOM"); +#endif + TRACELOG(LOG_INFO, "Supported raylib modules:"); TRACELOG(LOG_INFO, " > rcore:..... loaded (mandatory)"); TRACELOG(LOG_INFO, " > rlgl:...... loaded (mandatory)");