From 07b200e3f62bb158aa68f4d0cb5ab29d4a3e96c6 Mon Sep 17 00:00:00 2001
From: aricloverEXTRA <157071384+aricloverEXTRA@users.noreply.github.com>
Date: Tue, 23 Dec 2025 22:12:38 -0600
Subject: [PATCH] Update Makefile with new SDK and tweak settings

Refactor Makefile to improve readability and maintainability.

This change was made to improve uYouEnhanced. Makefile has been messy for quite some time now.
---
 Makefile | 71 ++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 49 insertions(+), 22 deletions(-)

diff --git a/Makefile b/Makefile
index 505bb2d..d6a5bf2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,10 @@
-export SYSROOT = $(SDK_PATH)
-export ARCHS = arm64
+SDKVERSION ?= 26.0
+SDK_PATH  ?= $(THEOS)/sdks/iPhoneOS$(SDKVERSION).sdk
+SYSROOT   ?= $(SDK_PATH)
+
+export SYSROOT
+export ARCHS ?= arm64
+export TARGET ?= iphone:clang:$(SDKVERSION):14.0
 
 export libcolorpicker_ARCHS = arm64
 export libFLEX_ARCHS = arm64
@@ -19,6 +24,7 @@ endif
 ifndef UYOU_VERSION
 UYOU_VERSION = 3.0.4
 endif
+
 PACKAGE_NAME = $(TWEAK_NAME)
 PACKAGE_VERSION = $(YOUTUBE_VERSION)-$(UYOU_VERSION)
 
@@ -31,19 +37,38 @@ $(TWEAK_NAME)_FILES := $(wildcard Sources/*.xm) $(wildcard Sources/*.x) $(wildca
 $(TWEAK_NAME)_FRAMEWORKS = UIKit Foundation AVFoundation AVKit Photos Accelerate CoreMotion GameController VideoToolbox Security
 $(TWEAK_NAME)_LIBRARIES = bz2 c++ iconv z
 $(TWEAK_NAME)_CFLAGS = -fobjc-arc -Wno-deprecated-declarations -Wno-unused-but-set-variable -DTWEAK_VERSION=\"$(PACKAGE_VERSION)\"
-#uYouLocalization $(TWEAK_NAME)_INJECT_DYLIBS = Tweaks/uYou/Library/MobileSubstrate/DynamicLibraries/uYou.dylib $(THEOS_OBJ_DIR)/uYouLocalization.dylib
-$(TWEAK_NAME)_INJECT_DYLIBS = Tweaks/uYou/Library/MobileSubstrate/DynamicLibraries/uYou.dylib $(THEOS_OBJ_DIR)/libFLEX.dylib $(THEOS_OBJ_DIR)/iSponsorBlock.dylib $(THEOS_OBJ_DIR)/YTABConfig.dylib $(THEOS_OBJ_DIR)/YTIcons.dylib $(THEOS_OBJ_DIR)/YouGroupSettings.dylib $(THEOS_OBJ_DIR)/YouLoop.dylib $(THEOS_OBJ_DIR)/YouMute.dylib $(THEOS_OBJ_DIR)/YouPiP.dylib $(THEOS_OBJ_DIR)/YouQuality.dylib $(THEOS_OBJ_DIR)/YouSlider.dylib $(THEOS_OBJ_DIR)/YouSpeed.dylib $(THEOS_OBJ_DIR)/YouTimeStamp.dylib $(THEOS_OBJ_DIR)/YouTubeDislikesReturn.dylib $(THEOS_OBJ_DIR)/DontEatMyContent.dylib $(THEOS_OBJ_DIR)/YTHoldForSpeed.dylib $(THEOS_OBJ_DIR)/YTUHD.dylib $(THEOS_OBJ_DIR)/YTVideoOverlay.dylib
+
+$(TWEAK_NAME)_INJECT_DYLIBS = Tweaks/uYou/Library/MobileSubstrate/DynamicLibraries/uYou.dylib \
+    $(THEOS_OBJ_DIR)/libFLEX.dylib \
+    $(THEOS_OBJ_DIR)/iSponsorBlock.dylib \
+    $(THEOS_OBJ_DIR)/YTABConfig.dylib \
+    $(THEOS_OBJ_DIR)/YTIcons.dylib \
+    $(THEOS_OBJ_DIR)/YouGroupSettings.dylib \
+    $(THEOS_OBJ_DIR)/YouLoop.dylib \
+    $(THEOS_OBJ_DIR)/YouMute.dylib \
+    $(THEOS_OBJ_DIR)/YouPiP.dylib \
+    $(THEOS_OBJ_DIR)/YouQuality.dylib \
+    $(THEOS_OBJ_DIR)/YouSlider.dylib \
+    $(THEOS_OBJ_DIR)/YouSpeed.dylib \
+    $(THEOS_OBJ_DIR)/YouTimeStamp.dylib \
+    $(THEOS_OBJ_DIR)/YouTubeDislikesReturn.dylib \
+    $(THEOS_OBJ_DIR)/DontEatMyContent.dylib \
+    $(THEOS_OBJ_DIR)/YTHoldForSpeed.dylib \
+    $(THEOS_OBJ_DIR)/YTUHD.dylib \
+    $(THEOS_OBJ_DIR)/YTVideoOverlay.dylib
+
 $(TWEAK_NAME)_EMBED_LIBRARIES = $(THEOS_OBJ_DIR)/libcolorpicker.dylib
 $(TWEAK_NAME)_EMBED_FRAMEWORKS = $(_THEOS_LOCAL_DATA_DIR)/$(THEOS_OBJ_DIR_NAME)/install_Alderis.xcarchive/Products/var/jb/Library/Frameworks/Alderis.framework
 $(TWEAK_NAME)_EMBED_BUNDLES = $(wildcard Bundles/*.bundle)
 $(TWEAK_NAME)_EMBED_EXTENSIONS = $(wildcard Extensions/*.appex)
 
 include $(THEOS)/makefiles/common.mk
+
 ifneq ($(JAILBROKEN),1)
-#uYouLocalization SUBPROJECTS += Tweaks/Alderis Tweaks/uYouLocalization
-SUBPROJECTS += Tweaks/Alderis Tweaks/DontEatMyContent Tweaks/FLEXing/libflex Tweaks/iSponsorBlock Tweaks/Return-YouTube-Dislikes Tweaks/YTABConfig Tweaks/YouGroupSettings Tweaks/YTIcons Tweaks/YouLoop Tweaks/YouMute Tweaks/YouPiP Tweaks/YouQuality Tweaks/YouSlider Tweaks/YouSpeed Tweaks/YouTimeStamp Tweaks/YTHoldForSpeed Tweaks/YTUHD Tweaks/YTVideoOverlay 
+SUBPROJECTS += Tweaks/Alderis Tweaks/DontEatMyContent Tweaks/FLEXing/libflex Tweaks/iSponsorBlock Tweaks/Return-YouTube-Dislikes Tweaks/YTABConfig Tweaks/YouGroupSettings Tweaks/YTIcons Tweaks/YouLoop Tweaks/YouMute Tweaks/YouPiP Tweaks/YouQuality Tweaks/YouSlider Tweaks/YouSpeed Tweaks/YouTimeStamp Tweaks/YTHoldForSpeed Tweaks/YTUHD Tweaks/YTVideoOverlay
 include $(THEOS_MAKE_PATH)/aggregate.mk
 endif
+
 include $(THEOS_MAKE_PATH)/tweak.mk
 
 REMOVE_EXTENSIONS = 1
@@ -55,25 +80,27 @@ UYOU_DYLIB = $(UYOU_PATH)/Library/MobileSubstrate/DynamicLibraries/uYou.dylib
 UYOU_BUNDLE = $(UYOU_PATH)/Library/Application\ Support/uYouBundle.bundle
 
 internal-clean::
-	@rm -rf $(UYOU_PATH)/*
+    @rm -rf $(UYOU_PATH)/*
 
 ifneq ($(JAILBROKEN),1)
 before-all::
-	@if [[ ! -f $(UYOU_DEB) ]]; then \
-		rm -rf $(UYOU_PATH)/*; \
-		$(PRINT_FORMAT_BLUE) "Downloading uYou"; \
-	fi
+    @if [[ ! -f $(UYOU_DEB) ]]; then \
+        rm -rf $(UYOU_PATH)/*; \
+        $(PRINT_FORMAT_BLUE) "Downloading uYou"; \
+    fi
 before-all::
-	@if [[ ! -f $(UYOU_DEB) ]]; then \
- 		curl -s -L "https://www.dropbox.com/scl/fi/01vvu5lm8nkkicrznku9v/com.miro.uyou_$(UYOU_VERSION)_iphoneos-arm.deb?rlkey=efgz7po8kqqvha8doplk1s3ky&dl=1" -o $(UYOU_DEB); \
- 	fi; \
-	if [[ ! -f $(UYOU_DYLIB) || ! -d $(UYOU_BUNDLE) ]]; then \
-		tar -xf Tweaks/uYou/com.miro.uyou_$(UYOU_VERSION)_iphoneos-arm.deb -C Tweaks/uYou; tar -xf Tweaks/uYou/data.tar* -C Tweaks/uYou; \
-		if [[ ! -f $(UYOU_DYLIB) || ! -d $(UYOU_BUNDLE) ]]; then \
-			$(PRINT_FORMAT_ERROR) "Failed to extract uYou"; exit 1; \
-		fi; \
-	fi;
+    @if [[ ! -f $(UYOU_DEB) ]]; then \
+        curl -s -L "https://www.dropbox.com/scl/fi/01vvu5lm8nkkicrznku9v/com.miro.uyou_$(UYOU_VERSION)_iphoneos-arm.deb?rlkey=efgz7po8kqqvha8doplk1s3ky&dl=1" -o $(UYOU_DEB); \
+    fi; \
+    if [[ ! -f $(UYOU_DYLIB) || ! -d $(UYOU_BUNDLE) ]]; then \
+        tar -xf Tweaks/uYou/com.miro.uyou_$(UYOU_VERSION)_iphoneos-arm.deb -C Tweaks/uYou; \
+        tar -xf Tweaks/uYou/data.tar* -C Tweaks/uYou; \
+        if [[ ! -f $(UYOU_DYLIB) || ! -d $(UYOU_BUNDLE) ]]; then \
+            $(PRINT_FORMAT_ERROR) "Failed to extract uYou"; exit 1; \
+        fi; \
+    fi;
 else
 before-package::
-	@mkdir -p $(THEOS_STAGING_DIR)/Library/Application\ Support; cp -r Localizations/uYouPlus.bundle $(THEOS_STAGING_DIR)/Library/Application\ Support/
-endif
+    @mkdir -p $(THEOS_STAGING_DIR)/Library/Application\ Support; \
+    cp -r Localizations/uYouPlus.bundle $(THEOS_STAGING_DIR)/Library/Application\ Support/
+endi