LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-12 08:30:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 12.0-development

Browse Source
This commit is contained in:
Sasha Szpakowski
2022-12-30 00:04:32 -04:00
parent 456f897e43 fc3f5ee620
commit 2e18128bec
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/xcode/liblove.xcodeproj/project.pbxproj
-12
View File
@@ -5720,10 +5720,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",
@@ -5759,10 +5755,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",
@@ -5799,10 +5791,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",
src/love.cpp
+5
View File
@@ -66,6 +66,11 @@ LOVE_EXPORT DWORD AmdPowerXpressRequestHighPerformance = 1;
#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)
{
std::vector<std::string> temp_argv;