Move dylib

DDRBoxman · Oct 10, 2023 · 4b504c4 · 4b504c4
1 parent c37373b
commit 4b504c4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/.github/workflows/macos-xcode.yml b/.github/workflows/macos-xcode.yml
@@ -29,6 +29,10 @@ jobs:
           default: true
           override: true
 
+      - name: Install dylibbundler
+        run: |
+          brew install dylibbundler
+
       - name: Build for mac
         run: ./build_macos_lib.sh
 
@@ -54,9 +58,10 @@ jobs:
         run: |
           xcodebuild ARCHS=x86_64 ONLY_ACTIVE_ARCH=NO archive -archivePath archive.xcarchive -scheme Cappy3ds
           xcodebuild -archivePath ./archive.xcarchive -exportArchive -exportPath ./  -exportOptionsPlist ./exportOptionsAdHoc.plist
+          dylibBundler -b -cd -d ./Cappy3ds.app/Contents/Frameworks -p @executable_path/../Frameworks/ -x ./Cappy3ds.app/Contents/Frameworks/libcappy3ds.dylib
           zip -r -X ../result.zip Cappy3ds.app
 
       - uses: actions/upload-artifact@v3
         with:
           name: macOS
-          path: result.zip
+          path: result.zip
diff --git a/macos/Cappy3ds.xcodeproj/project.pbxproj b/macos/Cappy3ds.xcodeproj/project.pbxproj
@@ -15,6 +15,7 @@
 		670A0A9A2AC14FEE00E03E0D /* Cappy3dsUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 670A0A992AC14FEE00E03E0D /* Cappy3dsUITests.swift */; };
 		670A0A9C2AC14FEE00E03E0D /* Cappy3dsUITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 670A0A9B2AC14FEE00E03E0D /* Cappy3dsUITestsLaunchTests.swift */; };
 		67A0F4582AC22EFB00B072B4 /* libcappy3ds.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 67A0F4572AC22EFB00B072B4 /* libcappy3ds.dylib */; };
+		67C897D02AD4DF6100F97849 /* libcappy3ds.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 67A0F4572AC22EFB00B072B4 /* libcappy3ds.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -39,8 +40,9 @@
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
 			dstPath = "";
-			dstSubfolderSpec = 6;
+			dstSubfolderSpec = 10;
 			files = (
+				67C897D02AD4DF6100F97849 /* libcappy3ds.dylib in CopyFiles */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -453,6 +455,7 @@
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)",
+					"@executable_path/../Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.recursivepenguin.Cappy3ds;
@@ -485,6 +488,7 @@
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)",
+					"@executable_path/../Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.recursivepenguin.Cappy3ds;