From 45b2f2ef751b758d27e7dcc7ad6b17db02a99011 Mon Sep 17 00:00:00 2001 From: Joseph Werle Date: Thu, 18 May 2023 12:51:42 -0400 Subject: [PATCH] fix(bin/install.sh,src/cli/templates.hh): fix refs to 'ios.{mm,o}' --- bin/install.sh | 4 ++-- src/cli/templates.hh | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bin/install.sh b/bin/install.sh index ef2508e287..611bf2dfef 100755 --- a/bin/install.sh +++ b/bin/install.sh @@ -418,7 +418,7 @@ function _prebuild_ios_main () { local clang="$(xcrun -sdk iphoneos -find clang++)" local cflags=($(TARGET_OS_IPHONE=1 "$root/bin/cflags.sh")) - local test_sources=($(find "$src"/ios/ios.mm 2>/dev/null)) + local test_sources=($(find "$src"/ios/*.mm 2>/dev/null)) local sources=() local outputs=() @@ -454,7 +454,7 @@ function _prebuild_ios_simulator_main () { local clang="$(xcrun -sdk iphonesimulator -find clang++)" local cflags=($(TARGET_IPHONE_SIMULATOR=1 ARCH="$arch" $root/bin/cflags.sh)) - local test_sources=($(find "$src"/ios/ios.mm 2>/dev/null)) + local test_sources=($(find "$src"/ios/*.mm 2>/dev/null)) local sources=() local outputs=() diff --git a/src/cli/templates.hh b/src/cli/templates.hh index 8329bbf73c..c1b3e84778 100644 --- a/src/cli/templates.hh +++ b/src/cli/templates.hh @@ -471,7 +471,7 @@ constexpr auto gXCodeProject = R"ASCII(// !$*UTF8*$! 17A7F8F229358D220051D146 /* init.cc in Sources */ = {isa = PBXBuildFile; fileRef = 17A7F8EE29358D180051D146 /* init.cc */; }; 17A7F8F529358D430051D146 /* libsocket-runtime.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 17A7F8F329358D430051D146 /* libsocket-runtime.a */; }; 17A7F8F629358D430051D146 /* libuv.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 17A7F8F429358D430051D146 /* libuv.a */; }; - 17A7F8F729358D4D0051D146 /* ios.o in Frameworks */ = {isa = PBXBuildFile; fileRef = 17A7F8F129358D180051D146 /* ios.o */; }; + 17A7F8F729358D4D0051D146 /* main.o in Frameworks */ = {isa = PBXBuildFile; fileRef = 17A7F8F129358D180051D146 /* main.o */; }; 17C230BA28E9398700301440 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17C230B928E9398700301440 /* Foundation.framework */; }; 290F7EBF2768C49000486988 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 294A3C792763E9C6007B5B9A /* UIKit.framework */; }; 290F7F87276BC2B000486988 /* lib in Resources */ = {isa = PBXBuildFile; fileRef = 290F7F86276BC2B000486988 /* lib */; }; @@ -485,7 +485,7 @@ constexpr auto gXCodeProject = R"ASCII(// !$*UTF8*$! /* Begin PBXFileReference section */ 17A7F8EE29358D180051D146 /* init.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = init.cc; sourceTree = ""; }; - 17A7F8F129358D180051D146 /* ios.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = ios.o; sourceTree = ""; }; + 17A7F8F129358D180051D146 /* main.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = main.o; sourceTree = ""; }; 17A7F8F329358D430051D146 /* libsocket-runtime.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libsocket-runtime.a"; path = "lib/libsocket-runtime.a"; sourceTree = ""; }; 17A7F8F429358D430051D146 /* libuv.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libuv.a; path = lib/libuv.a; sourceTree = ""; }; 17C230B928E9398700301440 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; @@ -511,7 +511,7 @@ constexpr auto gXCodeProject = R"ASCII(// !$*UTF8*$! files = ( 17A7F8F529358D430051D146 /* libsocket-runtime.a in Frameworks */, 17A7F8F629358D430051D146 /* libuv.a in Frameworks */, - 17A7F8F729358D4D0051D146 /* ios.o in Frameworks */, + 17A7F8F729358D4D0051D146 /* main.o in Frameworks */, 17C230BA28E9398700301440 /* Foundation.framework in Frameworks */, 2996EDB22770BC1F00C672A2 /* Network.framework in Frameworks */, 2996EDB22770BC1F00C672A3 /* CoreBluetooth.framework in Frameworks */, @@ -535,7 +535,7 @@ constexpr auto gXCodeProject = R"ASCII(// !$*UTF8*$! 17A7F8F029358D180051D146 /* ios */ = { isa = PBXGroup; children = ( - 17A7F8F129358D180051D146 /* ios.o */, + 17A7F8F129358D180051D146 /* main.o */, ); path = ios; sourceTree = "";