diff --git a/platform/xcode/liblove.xcodeproj/project.pbxproj b/platform/xcode/liblove.xcodeproj/project.pbxproj index bbafec76c..989a3c73f 100644 --- a/platform/xcode/liblove.xcodeproj/project.pbxproj +++ b/platform/xcode/liblove.xcodeproj/project.pbxproj @@ -5399,7 +5399,6 @@ "\"$(SRCROOT)/../../src/libraries/enet/libenet/include\"", ); IPHONEOS_DEPLOYMENT_TARGET = 9.0; - LD_RUNPATH_SEARCH_PATHS = "@rpath"; LIBRARY_SEARCH_PATHS = ""; MACOSX_DEPLOYMENT_TARGET = 10.9; ONLY_ACTIVE_ARCH = NO; @@ -5465,7 +5464,6 @@ "\"$(SRCROOT)/../../src/libraries/enet/libenet/include\"", ); IPHONEOS_DEPLOYMENT_TARGET = 9.0; - LD_RUNPATH_SEARCH_PATHS = "@rpath"; LIBRARY_SEARCH_PATHS = ""; MACOSX_DEPLOYMENT_TARGET = 10.9; ONLY_ACTIVE_ARCH = YES; @@ -5603,7 +5601,6 @@ "\"$(SRCROOT)/../../src/libraries/enet/libenet/include\"", ); IPHONEOS_DEPLOYMENT_TARGET = 9.0; - LD_RUNPATH_SEARCH_PATHS = "@rpath"; LIBRARY_SEARCH_PATHS = ""; LLVM_LTO = YES; MACOSX_DEPLOYMENT_TARGET = 10.9; @@ -5637,6 +5634,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", @@ -5675,6 +5673,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", @@ -5714,6 +5713,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", diff --git a/src/modules/window/sdl/Window.cpp b/src/modules/window/sdl/Window.cpp index d05062ae6..839d55d6e 100644 --- a/src/modules/window/sdl/Window.cpp +++ b/src/modules/window/sdl/Window.cpp @@ -843,11 +843,6 @@ bool Window::setFullscreen(bool fullscreen, FullscreenType fstype) SDL_GL_MakeCurrent(window, glcontext); updateSettings(newsettings, true); - - // This gets un-set when we exit fullscreen (at least in macOS). - if (!fullscreen) - SDL_SetWindowMinimumSize(window, settings.minwidth, settings.minheight); - return true; }