diff --git a/targets/app/common/ArchiveManager.cpp b/targets/app/common/ArchiveManager.cpp index 5d023a570..ce028bb31 100644 --- a/targets/app/common/ArchiveManager.cpp +++ b/targets/app/common/ArchiveManager.cpp @@ -3,8 +3,8 @@ #include #include -#include "app/common/UI/All Platforms/ArchiveFile.h" #include "app/common/Game.h" +#include "app/common/UI/All Platforms/ArchiveFile.h" #include "java/File.h" #include "minecraft/client/Minecraft.h" #include "minecraft/client/skins/TexturePack.h" @@ -18,14 +18,9 @@ ArchiveManager::ArchiveManager() void ArchiveManager::loadMediaArchive() { std::string mediapath = ""; -#if _WINDOWS64 mediapath = "Common\\Media\\MediaWindows64.arc"; -#elif __linux__ - mediapath = "app/common/Media/MediaLinux.arc"; -#endif if (!mediapath.empty()) { -#if defined(__linux__) std::string exeDirW = PlatformFilesystem.getBasePath().string(); std::string candidate = exeDirW + File::pathSeparator + mediapath; if (File(candidate).exists()) { @@ -33,9 +28,6 @@ void ArchiveManager::loadMediaArchive() { } else { m_mediaArchive = new ArchiveFile(File(mediapath)); } -#else - m_mediaArchive = new ArchiveFile(File(mediapath)); -#endif } } diff --git a/targets/resources/meson.build b/targets/resources/meson.build index 23af3e495..847217fd7 100644 --- a/targets/resources/meson.build +++ b/targets/resources/meson.build @@ -478,7 +478,7 @@ archive_sources_psvita = [ ] media_archive = custom_target('Minecraft.Media_Archive', - output : 'MediaLinux.arc', + output : 'MediaWindows64.arc', input : archive_sources + archive_sources_movies1080 + archive_sources_movies720 + archive_sources_linux, command : [ python, meson.project_source_root() / 'scripts/pack_arc.py',