might've been cooked idk not tested

JordanSantiagoYT · Dec 31, 2024 · 30d8146 · 30d8146
1 parent 7548c67
commit 30d8146
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 11 deletions.
diff --git a/Project.xml b/Project.xml
@@ -104,7 +104,10 @@
 	<assets path='art/readme.txt' rename='do NOT readme.txt' unless="mobile" />
 
 	<section if="android">
-		<assets path='art/ffmpeg-android/arm64/ffmpeg' rename="ffmpeg" />
+		<assets path='art/ffmpeg-android/ffmpeg-armv7a' rename="ffmpeg-armv7a" />
+		<assets path='art/ffmpeg-android/ffmpeg-arm64' rename="ffmpeg-arm64" />
+		<assets path='art/ffmpeg-android/ffmpeg-x86' rename="ffmpeg-x86" />
+		<assets path='art/ffmpeg-android/ffmpeg-x86_64' rename="ffmpeg-x86_64" />
 	</section>
 
 	<assets path="assets/fonts" />

diff --git a/art/ffmpeg-android/arm64/ffmpeg b/art/ffmpeg-android/arm64/ffmpeg
diff --git a/art/ffmpeg-android/ffmpeg-arm64 b/art/ffmpeg-android/ffmpeg-arm64
diff --git a/art/ffmpeg-android/ffmpeg-armv7a b/art/ffmpeg-android/ffmpeg-armv7a
diff --git a/art/ffmpeg-android/ffmpeg-x86 b/art/ffmpeg-android/ffmpeg-x86
diff --git a/art/ffmpeg-android/ffmpeg-x86_64 b/art/ffmpeg-android/ffmpeg-x86_64
diff --git a/source/PlayState.hx b/source/PlayState.hx
@@ -6764,9 +6764,6 @@ class PlayState extends MusicBeatState
 
 		ffmpegExists = true;
 
-		#if android
-		lime.system.JNI.createStaticMethod('org/libsdl/app/SDLActivity', 'nativeSetenv', '(Ljava/lang/String;Ljava/lang/String;)V')("LD_LIBRARY_PATH", android.content.Context.getFilesDir());
-		#end
 		process = new Process(#if android '${android.content.Context.getFilesDir()}/ffmpeg' #else 'ffmpeg' #end, [
 				'-v',
 				'quiet',
@@ -6806,10 +6803,6 @@ class PlayState extends MusicBeatState
 		if (!ClientPrefs.ffmpegMode)
 			return;
 
-		#if android
-		lime.system.JNI.createStaticMethod('org/libsdl/app/SDLActivity', 'nativeSetenv', '(Ljava/lang/String;Ljava/lang/String;)V')("LD_LIBRARY_PATH", '');
-		#end
-
 		if (process != null){
 			if (process.stdin != null)
 				process.stdin.close();

diff --git a/source/mobile/CopyState.hx b/source/mobile/CopyState.hx
@@ -40,6 +40,9 @@ import sys.FileSystem;
 
 using StringTools;
 
+#if (android && cpp)
+@:headerInclude('sys/utsname.h')
+#end
 class CopyState extends MusicBeatState
 {
 	public static var locatedFiles:Array<String> = [];
@@ -56,6 +59,9 @@ class CopyState extends MusicBeatState
 	var failedFilesStack:Array<String> = [];
 	var canUpdate:Bool = true;
 	var shouldCopy:Bool = false;
+	#if android
+	var archPrefix:String = "";
+	#end
 
 	private static final textFilesExtensions:Array<String> = ['ini', 'txt', 'xml', 'hxs', 'hx', 'lua', 'json', 'frag', 'vert'];
 
@@ -73,9 +79,21 @@ class CopyState extends MusicBeatState
 		CoolUtil.showPopUp("Seems like you have some missing files that are necessary to run the game\nPress OK to begin the copy process", "Notice!");
 
 		#if android
+		switch (getArch().toLowerCase())
+		{
+			case "armv7" | "armv7l" | "armv8l":
+				archPrefix = "armv7a";
+			case "arm64" | "aarch64" | "armv8" | :
+				archPrefix = "aarch64";
+			case "x86" | "i386" | "i686":
+				archPrefix = "x86";
+			case "x86_64" | "amd64":
+				archPrefix = "x86_64";
+		}
+
 		if (!FileSystem.exists(android.content.Context.getFilesDir() + '/ffmpeg'))
 		{
-			File.saveBytes(android.content.Context.getFilesDir() + '/ffmpeg', getFileBytes(getFile('ffmpeg')));
+			File.saveBytes(android.content.Context.getFilesDir() + '/ffmpeg-$archPrefix', getFileBytes(getFile('ffmpeg')));
 			Sys.command('chmod', ['777', android.content.Context.getFilesDir() + '/ffmpeg']);
 		}
 		#end
@@ -238,5 +256,16 @@ class CopyState extends MusicBeatState
 
 		return (maxLoopTimes < 0);
 	}
+
+	#if (android && cpp)
+	@:functionCode('
+		struct utsname osInfo{};
+		uname(&osInfo);
+		return ::String(osInfo.machine);
+	')
+	@:noCompletion
+	private function getArch():String
+		return null;
+	#end
 }
 #end
diff --git a/source/options/GameRendererSettingsSubState.hx b/source/options/GameRendererSettingsSubState.hx
@@ -92,7 +92,7 @@ class GameRendererSettingsSubState extends BaseOptionsMenu
 			'vidEncoder',
 			'string',
 			'libx264',
-			['libx264', 'libx264rgb', 'libx265', 'libxvid', 'libsvtav1', 'mpeg2video']);
+			['libx264', 'libx264rgb' #if !android , 'libx265', 'libxvid', 'libsvtav1' #end, 'mpeg2video']);
 		addOption(option);
 
 		var option:Option = new Option('Classic Rendering Mode', //Name

diff --git a/source/options/OptionsState.hx b/source/options/OptionsState.hx
@@ -33,7 +33,7 @@ class OptionsState extends MusicBeatState
 	var konamiIndex:Int = 0; // Track the progress in the Konami code sequence
 	var konamiCode = [];
 	var isEnteringKonamiCode:Bool = false;
-	var options:Array<String> = ['Note Colors', 'Controls', 'Adjust Delay and Combo', 'Graphics', 'Optimization', 'Game Rendering', 'Visuals and UI', 'Gameplay', 'Misc', 'Mobile Options'];
+	var options:Array<String> = ['Note Colors', 'Controls', 'Adjust Delay and Combo', 'Graphics', 'Optimization' #if (desktop && android), 'Game Rendering' #end, 'Visuals and UI', 'Gameplay', 'Misc', 'Mobile Options'];
 	private var grpOptions:FlxTypedGroup<Alphabet>;
 	private static var curSelected:Int = 0;
 	public static var menuBG:FlxSprite;