diff options
| author | Ray <[email protected]> | 2018-07-29 23:40:13 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-07-29 23:40:13 +0200 |
| commit | 7154a833138d4ec2990d7503bd8dfbd47920e9f7 (patch) | |
| tree | e1dd5530a916091eb2fb59082bad0f832617ace6 | |
| parent | 78487f7521a48460dda9560569add9893a4862cc (diff) | |
| parent | 89cec68565cb9540dfaca303e1fe72c6b65618f7 (diff) | |
| download | raylib-7154a833138d4ec2990d7503bd8dfbd47920e9f7.tar.gz raylib-7154a833138d4ec2990d7503bd8dfbd47920e9f7.zip | |
Merge pull request #610 from pamarcos/fix_chdir_macos
[games] Prevent GLFW changing working dir to 'Resources'
| -rw-r--r-- | src/core.c | 4 | ||||
| -rw-r--r-- | src/rglfw.c | 1 |
2 files changed, 4 insertions, 1 deletions
@@ -1869,6 +1869,10 @@ static bool InitGraphicsDevice(int width, int height) #if defined(PLATFORM_DESKTOP) || defined(PLATFORM_WEB) glfwSetErrorCallback(ErrorCallback); +#if defined(__APPLE__) + glfwInitHint(GLFW_COCOA_CHDIR_RESOURCES, GLFW_FALSE); +#endif + if (!glfwInit()) { TraceLog(LOG_WARNING, "Failed to initialize GLFW"); diff --git a/src/rglfw.c b/src/rglfw.c index 50d606d4..154eb4ff 100644 --- a/src/rglfw.c +++ b/src/rglfw.c @@ -42,7 +42,6 @@ #endif #if defined(__APPLE__) #define _GLFW_COCOA - #define _GLFW_USE_CHDIR // To chdir to the Resources subdirectory of the application bundle during glfwInit #define _GLFW_USE_MENUBAR // To create and populate the menu bar when the first window is created #define _GLFW_USE_RETINA // To have windows use the full resolution of Retina displays #endif |
