Fixing arm64 build.

rive-app · Dec 21, 2021 · ac6d507 · ac6d507
1 parent e81146f
commit ac6d507
Show file tree

Hide file tree

Showing 19 changed files with 78 additions and 33 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,5 +1,10 @@
-dependencies/ios/bin/debug/librive_fat.a filter=lfs diff=lfs merge=lfs -text
-dependencies/ios/bin/release/librive_fat.a filter=lfs diff=lfs merge=lfs -text
-dependencies/ios/bin/debug/librive_skia_renderer_fat.a filter=lfs diff=lfs merge=lfs -text
-dependencies/ios/bin/fat/librive_skia_renderer_fat.a filter=lfs diff=lfs merge=lfs -text
+dependencies/debug/librive_sim.a filter=lfs diff=lfs merge=lfs -text
+dependencies/debug/librive_skia_renderer_sim.a filter=lfs diff=lfs merge=lfs -text
+dependencies/debug/librive_skia_renderer.a filter=lfs diff=lfs merge=lfs -text
+dependencies/debug/librive.a filter=lfs diff=lfs merge=lfs -text
+dependencies/release/librive_sim.a filter=lfs diff=lfs merge=lfs -text
+dependencies/release/librive_skia_renderer_sim.a filter=lfs diff=lfs merge=lfs -text
+dependencies/release/librive_skia_renderer.a filter=lfs diff=lfs merge=lfs -text
+dependencies/release/librive.a filter=lfs diff=lfs merge=lfs -text
 dependencies/libskia_ios.a filter=lfs diff=lfs merge=lfs -text
+dependencies/libskia_ios_sim.a filter=lfs diff=lfs merge=lfs -text
diff --git a/.github/workflows/podspec.txt b/.github/workflows/podspec.txt
@@ -35,6 +35,6 @@ Pod::Spec.new do |spec|
     :tag => "v#{spec.version}"
   }
   spec.ios.vendored_frameworks = 'RiveRuntime.xcframework'
-  spec.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64 i386' }
-  spec.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64 i386' }
+  spec.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' }
+  spec.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' }
 end
diff --git a/RiveRuntime.xcodeproj/project.pbxproj b/RiveRuntime.xcodeproj/project.pbxproj
@@ -53,9 +53,6 @@
 		04BE5430264D1F4100427B39 /* LayerState.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BE542F264D1F4100427B39 /* LayerState.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		04BE5434264D267900427B39 /* LayerState.mm in Sources */ = {isa = PBXBuildFile; fileRef = 04BE5431264D243D00427B39 /* LayerState.mm */; };
 		04BE5436264D2A7500427B39 /* RivePrivateHeaders.h in Headers */ = {isa = PBXBuildFile; fileRef = 04BE5435264D2A7500427B39 /* RivePrivateHeaders.h */; };
-		2A70792B27260D3800C035A1 /* libskia_ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2A70792A27260D3800C035A1 /* libskia_ios.a */; };
-		2A70792D27260F3100C035A1 /* librive_fat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2A70792C27260F3100C035A1 /* librive_fat.a */; };
-		2A70792F27260F5C00C035A1 /* librive_skia_renderer_fat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2A70792E27260F5C00C035A1 /* librive_skia_renderer_fat.a */; };
 		2A7079352726277C00C035A1 /* rive_renderer_view.hh in Headers */ = {isa = PBXBuildFile; fileRef = 2A7079342726277C00C035A1 /* rive_renderer_view.hh */; settings = {ATTRIBUTES = (Public, ); }; };
 		2A707937272628AD00C035A1 /* rive_renderer_view.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2A707936272628AD00C035A1 /* rive_renderer_view.mm */; };
 		C9002A20263C76080011556B /* RiveView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9002A1F263C76080011556B /* RiveView.swift */; };
@@ -154,9 +151,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				2A70792F27260F5C00C035A1 /* librive_skia_renderer_fat.a in Frameworks */,
-				2A70792D27260F3100C035A1 /* librive_fat.a in Frameworks */,
-				2A70792B27260D3800C035A1 /* libskia_ios.a in Frameworks */,
 				C9D60DAC2512B04B00AAA3A6 /* QuartzCore.framework in Frameworks */,
 				C9CE8253263B716F00F98DDB /* UIKit.framework in Frameworks */,
 				C9D60DAA2512B01600AAA3A6 /* CoreGraphics.framework in Frameworks */,
@@ -548,7 +542,6 @@
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_CPP_EXCEPTIONS = NO;
@@ -614,7 +607,6 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_ENABLE_CPP_EXCEPTIONS = NO;
 				GCC_ENABLE_CPP_RTTI = NO;
@@ -670,15 +662,24 @@
 					"@loader_path/Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = (
-					"${PROJECT_DIR}/dependencies/ios/bin/debug",
+					"${PROJECT_DIR}/dependencies/debug",
 					"${PROJECT_DIR}/dependencies",
-					"$(PROJECT_DIR)/dependencies/ios/bin/release",
 				);
 				MARKETING_VERSION = 0.6.5;
 				OTHER_CFLAGS = (
 					"-fembed-bitcode",
 					"-DSK_METAL",
 				);
+				"OTHER_LDFLAGS[sdk=iphoneos*]" = (
+					"-lskia_ios",
+					"-lrive",
+					"-lrive_skia_renderer",
+				);
+				"OTHER_LDFLAGS[sdk=iphonesimulator*]" = (
+					"-lskia_ios_sim",
+					"-lrive_sim",
+					"-lrive_skia_renderer_sim",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = rive.app.ios.runtime.RiveRuntime;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
@@ -721,9 +722,8 @@
 					"@loader_path/Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = (
-					"${PROJECT_DIR}/dependencies/ios/bin/release",
+					"${PROJECT_DIR}/dependencies/release",
 					"${PROJECT_DIR}/dependencies",
-					"$(PROJECT_DIR)/dependencies/ios/bin/release",
 				);
 				MARKETING_VERSION = 0.6.5;
 				MTL_ENABLE_DEBUG_INFO = NO;
@@ -732,6 +732,16 @@
 					"-fembed-bitcode",
 					"-DSK_METAL",
 				);
+				"OTHER_LDFLAGS[sdk=iphoneos*]" = (
+					"-lskia_ios",
+					"-lrive",
+					"-lrive_skia_renderer",
+				);
+				"OTHER_LDFLAGS[sdk=iphonesimulator*]" = (
+					"-lskia_ios_sim",
+					"-lrive_sim",
+					"-lrive_skia_renderer_sim",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = rive.app.ios.runtime.RiveRuntime;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;

diff --git a/dependencies/debug/librive.a b/dependencies/debug/librive.a
diff --git a/dependencies/debug/librive_sim.a b/dependencies/debug/librive_sim.a
diff --git a/dependencies/debug/librive_skia_renderer.a b/dependencies/debug/librive_skia_renderer.a
diff --git a/dependencies/debug/librive_skia_renderer_sim.a b/dependencies/debug/librive_skia_renderer_sim.a
diff --git a/dependencies/ios/bin/debug/librive_fat.a b/dependencies/ios/bin/debug/librive_fat.a
diff --git a/dependencies/ios/bin/debug/librive_skia_renderer_fat.a b/dependencies/ios/bin/debug/librive_skia_renderer_fat.a
diff --git a/dependencies/ios/bin/release/librive_fat.a b/dependencies/ios/bin/release/librive_fat.a
diff --git a/dependencies/ios/bin/release/librive_skia_renderer_fat.a b/dependencies/ios/bin/release/librive_skia_renderer_fat.a
diff --git a/dependencies/libskia_ios.a b/dependencies/libskia_ios.a
diff --git a/dependencies/libskia_ios_sim.a b/dependencies/libskia_ios_sim.a
diff --git a/dependencies/release/librive.a b/dependencies/release/librive.a
diff --git a/dependencies/release/librive_sim.a b/dependencies/release/librive_sim.a
diff --git a/dependencies/release/librive_skia_renderer.a b/dependencies/release/librive_skia_renderer.a
diff --git a/dependencies/release/librive_skia_renderer_sim.a b/dependencies/release/librive_skia_renderer_sim.a
diff --git a/make_dependencies.sh b/make_dependencies.sh
@@ -14,6 +14,18 @@ popd
 
 rm -fr dependencies
 mkdir dependencies
-cp -r submodules/rive-cpp/build/ios* dependencies
-cp -r submodules/rive-cpp/skia/renderer/build/ios* dependencies
-cp -r submodules/rive-cpp/skia/dependencies/skia/out/libskia_ios.a dependencies
+mkdir dependencies/debug
+mkdir dependencies/release
+
+cp -r submodules/rive-cpp/build/ios/bin/debug/librive.a dependencies/debug/librive.a
+cp -r submodules/rive-cpp/build/ios/bin/release/librive.a dependencies/release/librive.a
+cp -r submodules/rive-cpp/build/ios_sim/bin/debug/librive.a dependencies/debug/librive_sim.a
+cp -r submodules/rive-cpp/build/ios_sim/bin/release/librive.a dependencies/release/librive_sim.a
+
+cp -r submodules/rive-cpp/skia/renderer/build/ios/bin/debug/librive_skia_renderer.a dependencies/debug/librive_skia_renderer.a
+cp -r submodules/rive-cpp/skia/renderer/build/ios/bin/release/librive_skia_renderer.a dependencies/release/librive_skia_renderer.a
+cp -r submodules/rive-cpp/skia/renderer/build/ios_sim/bin/debug/librive_skia_renderer.a dependencies/debug/librive_skia_renderer_sim.a
+cp -r submodules/rive-cpp/skia/renderer/build/ios_sim/bin/release/librive_skia_renderer.a dependencies/release/librive_skia_renderer_sim.a
+
+cp -r submodules/rive-cpp/skia/dependencies/skia/out/libskia_ios.a dependencies
+cp -r submodules/rive-cpp/skia/dependencies/skia/out/libskia_ios_sim.a dependencies
diff --git a/submodules/rive-cpp b/submodules/rive-cpp