From 878ad785bcb121a7faea1fe66f48ed7c894af609 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Sun, 16 Jan 2022 18:41:14 -0400 Subject: [PATCH 1/2] Remove obsolete macOS window min size workaround. Fixes #1444. The reason for the SetWindowMinSize call after exiting fullscreen doesn't seem to be needed anymore, and it was breaking setFullscreen(false) in Linux. --- src/modules/window/sdl/Window.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/modules/window/sdl/Window.cpp b/src/modules/window/sdl/Window.cpp index c7103420d..798b606ed 100644 --- a/src/modules/window/sdl/Window.cpp +++ b/src/modules/window/sdl/Window.cpp @@ -723,11 +723,6 @@ bool Window::setFullscreen(bool fullscreen, Window::FullscreenType fstype) { SDL_GL_MakeCurrent(window, context); updateSettings(newsettings, true); - - // Apparently this gets un-set when we exit fullscreen (at least in OS X). - if (!fullscreen) - SDL_SetWindowMinimumSize(window, settings.minwidth, settings.minheight); - return true; } From 456c16b9c4a4e4593ad411d3597b9d86593b7eb9 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Fri, 4 Feb 2022 20:27:13 -0400 Subject: [PATCH 2/2] macOS: Fix love.framework's runpath search path Fixes loading love.framework from a standalone Lua executable, and potentially fixes some code signing issues (#1737) --- platform/xcode/liblove.xcodeproj/project.pbxproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/xcode/liblove.xcodeproj/project.pbxproj b/platform/xcode/liblove.xcodeproj/project.pbxproj index ac729053a..a9e7bb610 100644 --- a/platform/xcode/liblove.xcodeproj/project.pbxproj +++ b/platform/xcode/liblove.xcodeproj/project.pbxproj @@ -4951,7 +4951,6 @@ "\"$(SRCROOT)/../../src/libraries/enet/libenet/include\"", ); IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "@rpath"; LIBRARY_SEARCH_PATHS = ""; MACOSX_DEPLOYMENT_TARGET = 10.7; ONLY_ACTIVE_ARCH = NO; @@ -5017,7 +5016,6 @@ "\"$(SRCROOT)/../../src/libraries/enet/libenet/include\"", ); IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "@rpath"; LIBRARY_SEARCH_PATHS = ""; MACOSX_DEPLOYMENT_TARGET = 10.7; ONLY_ACTIVE_ARCH = YES; @@ -5158,7 +5156,6 @@ "\"$(SRCROOT)/../../src/libraries/enet/libenet/include\"", ); IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "@rpath"; LIBRARY_SEARCH_PATHS = ""; LLVM_LTO = YES; MACOSX_DEPLOYMENT_TARGET = 10.7; @@ -5193,6 +5190,7 @@ ); INFOPLIST_FILE = "macosx/liblove-macosx.plist"; LD_DYLIB_INSTALL_NAME = "@rpath/$(EXECUTABLE_PATH)"; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../../"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/ios/libraries/freetype", @@ -5232,6 +5230,7 @@ ); INFOPLIST_FILE = "macosx/liblove-macosx.plist"; LD_DYLIB_INSTALL_NAME = "@rpath/$(EXECUTABLE_PATH)"; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../../"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/ios/libraries/freetype", @@ -5272,6 +5271,7 @@ ); INFOPLIST_FILE = "macosx/liblove-macosx.plist"; LD_DYLIB_INSTALL_NAME = "@rpath/$(EXECUTABLE_PATH)"; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../../"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/ios/libraries/freetype",