MrMonopoly/raylib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:raysan5/raylib

Browse Source
This commit is contained in:
Jeffery Myers 2024-09-27 10:04:33 -07:00
commit d92498034a
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/platforms/rcore_android.c
View File

@ -74,7 +74,7 @@ typedef struct {
// Global Variables Definition // Global Variables Definition
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
extern CoreData CORE; // Global CORE state context extern CoreData CORE; // Global CORE state context
extern bool isGpuReady; // Flag to note GPU has been initialized successfully
static PlatformData platform = { 0 }; // Platform specific data static PlatformData platform = { 0 }; // Platform specific data
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
@ -989,6 +989,7 @@ static void AndroidCommandCallback(struct android_app *app, int32_t cmd)
// Initialize OpenGL context (states and resources) // Initialize OpenGL context (states and resources)
// NOTE: CORE.Window.currentFbo.width and CORE.Window.currentFbo.height not used, just stored as globals in rlgl // NOTE: CORE.Window.currentFbo.width and CORE.Window.currentFbo.height not used, just stored as globals in rlgl
rlglInit(CORE.Window.currentFbo.width, CORE.Window.currentFbo.height); rlglInit(CORE.Window.currentFbo.width, CORE.Window.currentFbo.height);
isGpuReady = true;
// Setup default viewport // Setup default viewport
// NOTE: It updated CORE.Window.render.width and CORE.Window.render.height // NOTE: It updated CORE.Window.render.width and CORE.Window.render.height

17
src/rcore.c
View File

@ -195,23 +195,12 @@ unsigned int __stdcall timeEndPeriod(unsigned int uPeriod);
#include <direct.h> // Required for: _getch(), _chdir(), _mkdir() #include <direct.h> // Required for: _getch(), _chdir(), _mkdir()
#define GETCWD _getcwd // NOTE: MSDN recommends not to use getcwd(), chdir() #define GETCWD _getcwd // NOTE: MSDN recommends not to use getcwd(), chdir()
#define CHDIR _chdir #define CHDIR _chdir
#define MKDIR(dir) _mkdir(dir)
#else #else
#include <unistd.h> // Required for: getch(), chdir() (POSIX), access() #include <unistd.h> // Required for: getch(), chdir(), mkdir(), access()
#define GETCWD getcwd #define GETCWD getcwd
#define CHDIR chdir #define CHDIR chdir
#endif #define MKDIR(dir) mkdir(dir, 0777)
#if defined(_MSC_VER) && ((defined(WIN32) || defined(_WIN32) || defined(__WIN32)) && !defined(__CYGWIN__))
#include <direct.h> // Required for: _mkdir()
#define MKDIR(dir) _mkdir(dir)
#elif defined __GNUC__
#if defined(__linux__)
#define MKDIR(dir) mkdir(dir, 0777);
#else
#include <sys/types.h>
#include <sys/stat.h> // Required for: mkdir()
#define MKDIR(dir) _mkdir(dir) // OLD: mkdir(dir, 0777) -> w64devkit complaints!
#endif
#endif #endif
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------