Merge pull request #62 from aws-lumberyard-dev/SPEC-6295

[iOS] Fix build issues

Code/LauncherUnified/Platform/iOS/O3DEApplicationDelegate_iOS.mm

@@ -39,15 +39,15 @@ namespace
 }
 
 
-@interface LumberyardApplicationDelegate_iOS : NSObject<UIApplicationDelegate>
+@interface O3DEApplicationDelegate_iOS : NSObject<UIApplicationDelegate>
 {
 }
-@end    // LumberyardApplicationDelegate_iOS Interface
+@end    // O3DEApplicationDelegate_iOS Interface
 
-@implementation LumberyardApplicationDelegate_iOS
+@implementation O3DEApplicationDelegate_iOS
 
 
-- (int)runLumberyardApplication
+- (int)runO3DEApplication
 {
 #if AZ_TESTS_ENABLED
 
@@ -55,7 +55,7 @@ namespace
     return static_cast<int>(ReturnCode::ErrUnitTestNotSupported);
 
 #else
-    using namespace LumberyardLauncher;
+    using namespace O3DELauncher;
 
     PlatformMainInfo mainInfo;
     mainInfo.m_updateResourceLimits = IncreaseResourceLimits;
@@ -79,19 +79,19 @@ namespace
 #endif // AZ_TESTS_ENABLED
 }
 
-- (void)launchLumberyardApplication
+- (void)launchO3DEApplication
 {
-    const int exitCode = [self runLumberyardApplication];
+    const int exitCode = [self runO3DEApplication];
     exit(exitCode);
 }
 
 - (BOOL)application:(UIApplication*)application didFinishLaunchingWithOptions:(NSDictionary*)launchOptions
 {
-    // prevent the lumberyard runtime from running when launched in a xctest environment, otherwise the
+    // prevent the o3de runtime from running when launched in a xctest environment, otherwise the
     // testing framework will kill the "app" due to the lengthy bootstrap process
     if ([[NSProcessInfo processInfo] environment][@"XCTestConfigurationFilePath"] == nil)
     {
-        [self performSelector:@selector(launchLumberyardApplication) withObject:nil afterDelay:0.0];
+        [self performSelector:@selector(launchO3DEApplication) withObject:nil afterDelay:0.0];
     }
     return YES;
 }
@@ -132,4 +132,4 @@ namespace
         &AzFramework::IosLifecycleEvents::Bus::Events::OnDidReceiveMemoryWarning);
 }
 
-@end // LumberyardApplicationDelegate_iOS Implementation
+@end // O3DEApplicationDelegate_iOS Implementation

Code/LauncherUnified/Platform/iOS/O3DEApplication_iOS.mm

@@ -16,12 +16,12 @@
 #include <AzFramework/Input/Buses/Notifications/RawInputNotificationBus_Platform.h>
 
 
-@interface LumberyardApplication_iOS : UIApplication
+@interface O3DEApplication_iOS : UIApplication
 {
 }
-@end    // LumberyardApplication_iOS Interface
+@end    // O3DEApplication_iOS Interface
 
-@implementation LumberyardApplication_iOS
+@implementation O3DEApplication_iOS
 
 - (void)touchesBegan: (NSSet<UITouch*>*)touches withEvent: (UIEvent*)event
 {
@@ -65,4 +65,4 @@
     [self touchesEnded: touches withEvent: event];
 }
 
-@end // LumberyardApplication_iOS Implementation
+@end // O3DEApplication_iOS Implementation

Code/LauncherUnified/Platform/iOS/platform_ios_files.cmake

@@ -13,8 +13,8 @@ set(FILES
     Launcher_iOS.mm
     Launcher_Traits_iOS.h
     Launcher_Traits_Platform.h
-    LumberyardApplication_iOS.mm
-    LumberyardApplicationDelegate_iOS.mm
+    O3DEApplication_iOS.mm
+    O3DEApplicationDelegate_iOS.mm
     ../Common/Apple/Launcher_Apple.mm
     ../Common/Apple/Launcher_Apple.h
     ../Common/UnixLike/Launcher_UnixLike.cpp

cmake/Platform/iOS/RuntimeDependencies_ios.cmake

@@ -28,6 +28,17 @@ function(ios_get_dependencies_recursive ios_DEPENDENCIES ly_TARGET)
         return() # Nothing to do
     endif()
 
+    # See if we already have dependencies cached.
+    get_property(are_dependencies_cached GLOBAL PROPERTY LY_RUNTIME_DEPENDENCIES_${ly_TARGET} SET)
+    if(are_dependencies_cached)
+
+        # We already walked through this target
+        get_property(cached_dependencies GLOBAL PROPERTY LY_RUNTIME_DEPENDENCIES_${ly_TARGET})
+        set(${ios_DEPENDENCIES} ${cached_dependencies} PARENT_SCOPE)
+        return()
+
+    endif()
+
     # Collect all direct dependencies.
     unset(direct_dependencies)
     unset(dependencies)
@@ -102,6 +113,7 @@ function(ios_get_dependencies_recursive ios_DEPENDENCIES ly_TARGET)
 
     # Remove duplicate dependencies and return.
     list(REMOVE_DUPLICATES all_dependencies)
+    set_property(GLOBAL PROPERTY LY_RUNTIME_DEPENDENCIES_${ly_TARGET} "${all_dependencies}")
     set(${ios_DEPENDENCIES} ${all_dependencies} PARENT_SCOPE)
 
 endfunction()