From fc5b53a4566af54afd333ed79fa5dec6ecc505f2 Mon Sep 17 00:00:00 2001 From: Sasha Szpakowski Date: Fri, 30 Dec 2022 00:01:10 -0400 Subject: [PATCH 1/2] macOS: work around linking issues when building the app executable. --- src/love.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/love.cpp b/src/love.cpp index c8af8596a..dbb6120f9 100644 --- a/src/love.cpp +++ b/src/love.cpp @@ -65,6 +65,11 @@ LOVE_EXPORT DWORD AmdPowerXpressRequestHighPerformance = 1; #include +// Explicitly instantiate std::vector to work around linker issues +// with libc++ when symbols are hidden-by-default. +// https://stackoverflow.com/a/48273604 +template class std::vector; + static void get_app_arguments(int argc, char **argv, int &new_argc, char **&new_argv) { std::vector temp_argv; From fc3f5ee6209a0aab9a4d381ed5cd99110f9ff2f2 Mon Sep 17 00:00:00 2001 From: Sasha Szpakowski Date: Fri, 30 Dec 2022 00:03:58 -0400 Subject: [PATCH 2/2] macOS: remove stray library search path --- platform/xcode/liblove.xcodeproj/project.pbxproj | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/platform/xcode/liblove.xcodeproj/project.pbxproj b/platform/xcode/liblove.xcodeproj/project.pbxproj index 1194b78b5..2dcebd1eb 100644 --- a/platform/xcode/liblove.xcodeproj/project.pbxproj +++ b/platform/xcode/liblove.xcodeproj/project.pbxproj @@ -5194,10 +5194,6 @@ 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", - ); MARKETING_VERSION = 11.4; OTHER_LDFLAGS = ( "-undefined", @@ -5234,10 +5230,6 @@ 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", - ); MARKETING_VERSION = 11.4; OTHER_LDFLAGS = ( "-undefined", @@ -5275,10 +5267,6 @@ 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", - ); MARKETING_VERSION = 11.4; OTHER_LDFLAGS = ( "-undefined",