From 598eadfa62b77bd8b0cacdc6ca2535145ae4eb2c Mon Sep 17 00:00:00 2001 From: Sit Melai Date: Fri, 2 Sep 2016 21:33:20 +0200 Subject: [PATCH] Various build folders added to .gitignore and fixed an error in opengl driver on mac --- .gitignore | 5 +++++ code/nel/src/3d/driver/opengl/driver_opengl_window.cpp | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 6d75a91f5..4cf8b9373 100644 --- a/.gitignore +++ b/.gitignore @@ -162,6 +162,11 @@ build/* install/* build_vc* code/nel/tools/build_gamedata/configuration/buildsite.py +code/build_mac +code/build_linux32 +code/build_linux64 +code/build_windows32 +code/build_server # Linux nel compile code/nel/build/nel-config diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp index db6400042..c826238ea 100644 --- a/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp +++ b/code/nel/src/3d/driver/opengl/driver_opengl_window.cpp @@ -1486,7 +1486,7 @@ bool CDriverGL::createWindow(const GfxMode &mode) [[CocoaApplicationDelegate alloc] initWithDriver:this]; // set the application delegate, this will handle window/app close events - [NSApp setDelegate:(id)appDelegate]; + [NSApp setDelegate:(id)appDelegate]; // bind the close button of the window to applicationShouldTerminate id closeButton = [cocoa_window standardWindowButton:NSWindowCloseButton];