Browse Source

Merge branch 'main' into 12.0-development

Sasha Szpakowski 2 years ago
parent
commit
2e18128bec
2 changed files with 5 additions and 12 deletions
  1. 0 12
      platform/xcode/liblove.xcodeproj/project.pbxproj
  2. 5 0
      src/love.cpp

+ 0 - 12
platform/xcode/liblove.xcodeproj/project.pbxproj

@@ -5720,10 +5720,6 @@
 				INFOPLIST_FILE = "macosx/liblove-macosx.plist";
 				INFOPLIST_FILE = "macosx/liblove-macosx.plist";
 				LD_DYLIB_INSTALL_NAME = "@rpath/$(EXECUTABLE_PATH)";
 				LD_DYLIB_INSTALL_NAME = "@rpath/$(EXECUTABLE_PATH)";
 				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../../";
 				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../../";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/ios/libraries/freetype",
-				);
 				MARKETING_VERSION = 11.4;
 				MARKETING_VERSION = 11.4;
 				OTHER_LDFLAGS = (
 				OTHER_LDFLAGS = (
 					"-undefined",
 					"-undefined",
@@ -5759,10 +5755,6 @@
 				INFOPLIST_FILE = "macosx/liblove-macosx.plist";
 				INFOPLIST_FILE = "macosx/liblove-macosx.plist";
 				LD_DYLIB_INSTALL_NAME = "@rpath/$(EXECUTABLE_PATH)";
 				LD_DYLIB_INSTALL_NAME = "@rpath/$(EXECUTABLE_PATH)";
 				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../../";
 				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../../";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/ios/libraries/freetype",
-				);
 				MARKETING_VERSION = 11.4;
 				MARKETING_VERSION = 11.4;
 				OTHER_LDFLAGS = (
 				OTHER_LDFLAGS = (
 					"-undefined",
 					"-undefined",
@@ -5799,10 +5791,6 @@
 				INFOPLIST_FILE = "macosx/liblove-macosx.plist";
 				INFOPLIST_FILE = "macosx/liblove-macosx.plist";
 				LD_DYLIB_INSTALL_NAME = "@rpath/$(EXECUTABLE_PATH)";
 				LD_DYLIB_INSTALL_NAME = "@rpath/$(EXECUTABLE_PATH)";
 				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../../";
 				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../../";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/ios/libraries/freetype",
-				);
 				MARKETING_VERSION = 11.4;
 				MARKETING_VERSION = 11.4;
 				OTHER_LDFLAGS = (
 				OTHER_LDFLAGS = (
 					"-undefined",
 					"-undefined",

+ 5 - 0
src/love.cpp

@@ -66,6 +66,11 @@ LOVE_EXPORT DWORD AmdPowerXpressRequestHighPerformance = 1;
 
 
 #include <vector>
 #include <vector>
 
 
+// Explicitly instantiate std::vector<std::string> to work around linker issues
+// with libc++ when symbols are hidden-by-default.
+// https://stackoverflow.com/a/48273604
+template class std::vector<std::string>;
+
 static void get_app_arguments(int argc, char **argv, int &new_argc, char **&new_argv)
 static void get_app_arguments(int argc, char **argv, int &new_argc, char **&new_argv)
 {
 {
 	std::vector<std::string> temp_argv;
 	std::vector<std::string> temp_argv;