From c74230a9ea2f38517b9072b5ee968cc3d4167d65 Mon Sep 17 00:00:00 2001 From: Jon <1671674+jonlamb-gh@users.noreply.github.com> Date: Fri, 9 Apr 2021 10:57:14 -0700 Subject: Enable DRM platform cross compilation support (#1717) * Log a warning if chdir failed, use agnostic CHDIR instead of chdir * Only include libdrm directory explicitly when not cross compiling --- src/models.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/models.c b/src/models.c index 5f59f535..6c9a75ba 100644 --- a/src/models.c +++ b/src/models.c @@ -3168,7 +3168,11 @@ static Model LoadOBJ(const char *fileName) unsigned int dataSize = (unsigned int)strlen(fileData); char currentDir[1024] = { 0 }; strcpy(currentDir, GetWorkingDirectory()); - chdir(GetDirectoryPath(fileName)); + const char *workingDir = GetDirectoryPath(fileName); + if (CHDIR(workingDir) != 0) + { + TRACELOG(LOG_WARNING, "MODEL: [%s] Failed to change working directory", workingDir); + } unsigned int flags = TINYOBJ_FLAG_TRIANGULATE; int ret = tinyobj_parse_obj(&attrib, &meshes, &meshCount, &materials, &materialCount, fileData, dataSize, flags); @@ -3306,7 +3310,10 @@ static Model LoadOBJ(const char *fileName) RL_FREE(vnCount); RL_FREE(faceCount); - chdir(currentDir); + if (CHDIR(currentDir) != 0) + { + TRACELOG(LOG_WARNING, "MODEL: [%s] Failed to change working directory", currentDir); + } } return model; -- cgit v1.2.3