fix header paths

rA9stuff · Nov 25, 2023 · 45d451b · 45d451b
1 parent 3822169
commit 45d451b
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 21 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,6 +24,8 @@ jobs:
       run: rm -rf __MACOSX/ build
     - name: pod install
       run: pod install
+    - name: download headers
+      run: chmod +x download_headers.sh && ./download_headers.sh
     - name: build
       run: xcodebuild -workspace LeetDown.xcworkspace -scheme LeetDown_M CONFIGURATION_BUILD_DIR=/Users/runner/work/LeetDown/LeetDown
     - name: envdetails2

diff --git a/LeetDown.xcodeproj/project.pbxproj b/LeetDown.xcodeproj/project.pbxproj
@@ -794,10 +794,7 @@
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_TESTING_SEARCH_PATHS = YES;
 				EXCLUDED_ARCHS = arm64;
-				FRAMEWORK_SEARCH_PATHS = (
-					"@executable_path/../Frameworks",
-					"$(inherited)",
-				);
+				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					HAVE_INTTYPES_H,
 					HAVE_PKCRYPT,
@@ -809,13 +806,8 @@
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
+					"${PROJECT_DIR}/headers",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking/AFNetworking.framework/Headers\"",
-					"$(HOME)/limd-build",
-					"$(HOME)/limd-build/libimobiledevice/include",
-					"$(HOME)/limd-build/libplist/include",
-					"$(HOME)/limd-build/libimobiledevice-glue/include",
-					"$(HOME)/limd-build/libimobiledevice-glue/src",
-					"$(HOME)/limd-build/libideviceactivation/include",
 				);
 				INFOPLIST_FILE = LeetDown_M/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -826,7 +818,6 @@
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Frameworks",
-					/opt/homebrew/Cellar/libusb/1.0.26/lib,
 					"$(PROJECT_DIR)",
 					"$(PROJECT_DIR)/Frameworks/ipwnder_lite",
 					"$(PROJECT_DIR)/Frameworks/iPwnder32",
@@ -838,6 +829,14 @@
 				PRODUCT_BUNDLE_IDENTIFIER = rA9.LeetDown;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				SYSTEM_HEADER_SEARCH_PATHS = (
+					"${PROJECT_DIR}/headers",
+					"${PROJECT_DIR}/headers/libimobiledevice/include",
+					"${PROJECT_DIR}/headers/libplist/include",
+					"${PROJECT_DIR}/headers/libimobiledevice-glue/include",
+					"${PROJECT_DIR}/headers/libimobiledevice-glue/src",
+				);
+				USER_HEADER_SEARCH_PATHS = "${PROJECT_DIR}/headers";
 			};
 			name = Debug;
 		};
@@ -861,10 +860,7 @@
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_TESTING_SEARCH_PATHS = YES;
 				EXCLUDED_ARCHS = arm64;
-				FRAMEWORK_SEARCH_PATHS = (
-					"@executable_path/../Frameworks",
-					"$(inherited)",
-				);
+				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					HAVE_INTTYPES_H,
 					HAVE_PKCRYPT,
@@ -876,12 +872,8 @@
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
+					"${PROJECT_DIR}/headers",
 					"\"${PODS_CONFIGURATION_BUILD_DIR}/AFNetworking/AFNetworking.framework/Headers\"",
-					"$(HOME)/limd-build",
-					"$(HOME)/limd-build/libimobiledevice/include",
-					"$(HOME)/limd-build/libplist/include",
-					"$(HOME)/limd-build/libimobiledevice-glue/include",
-					"$(HOME)/limd-build/libimobiledevice-glue/src",
 				);
 				INFOPLIST_FILE = LeetDown_M/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -892,7 +884,6 @@
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Frameworks",
-					/opt/homebrew/Cellar/libusb/1.0.26/lib,
 					"$(PROJECT_DIR)",
 					"$(PROJECT_DIR)/Frameworks/ipwnder_lite",
 					"$(PROJECT_DIR)/Frameworks/iPwnder32",
@@ -904,6 +895,14 @@
 				PRODUCT_BUNDLE_IDENTIFIER = rA9.LeetDown;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				SYSTEM_HEADER_SEARCH_PATHS = (
+					"${PROJECT_DIR}/headers",
+					"${PROJECT_DIR}/headers/libimobiledevice/include",
+					"${PROJECT_DIR}/headers/libplist/include",
+					"${PROJECT_DIR}/headers/libimobiledevice-glue/include",
+					"${PROJECT_DIR}/headers/libimobiledevice-glue/src",
+				);
+				USER_HEADER_SEARCH_PATHS = "${PROJECT_DIR}/headers";
 			};
 			name = Release;
 		};

diff --git a/download_headers.sh b/download_headers.sh
@@ -0,0 +1,6 @@
+mkdir headers && cd headers
+git clone https://github.com/libimobiledevice/libimobiledevice.git
+git clone https://github.com/libimobiledevice/libirecovery.git
+git clone https://github.com/libimobiledevice/libusbmuxd.git
+git clone https://github.com/libimobiledevice/libplist.git
+git clone https://github.com/libimobiledevice/libimobiledevice-glue.git