From 284912c3ead79f5063d165f42f681f865b7b8cec Mon Sep 17 00:00:00 2001 From: Maschell Date: Tue, 14 May 2019 22:28:30 +0200 Subject: [PATCH] Stub libntfs usage. --- Makefile | 2 +- installupdateportlibs.sh | 2 -- src/myutils/libntfs.cpp | 11 ++++++----- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index d45369d..763cb6a 100644 --- a/Makefile +++ b/Makefile @@ -77,7 +77,7 @@ MAKEFLAGS += --no-print-directory #--------------------------------------------------------------------------------- # any extra libraries we wish to link with the project #--------------------------------------------------------------------------------- -LIBS := -lgui -lm -lgcc -lfat -lntfs -liosuhax -lutils -ldynamiclibs -lfreetype -lgd -lpng -ljpeg -lz -lmad -lvorbisidec +LIBS := -lgui -lm -lgcc -lfat -liosuhax -lutils -ldynamiclibs -lfreetype -lgd -lpng -ljpeg -lz -lmad -lvorbisidec #--------------------------------------------------------------------------------- # list of directories containing libraries, this must be the top level containing diff --git a/installupdateportlibs.sh b/installupdateportlibs.sh index 979d9dd..6f6d891 100644 --- a/installupdateportlibs.sh +++ b/installupdateportlibs.sh @@ -6,7 +6,6 @@ cd portlib_repos ((git clone https://github.com/Maschell/dynamic_libs.git -b lib && (7z x -y ./dynamic_libs/libs/portlibs.zip -o${DEVKITPRO})) || (cd dynamic_libs && git pull)) (git clone https://github.com/dimok789/libiosuhax.git || (cd libiosuhax && git pull)) (git clone https://github.com/Maschell/libfat.git || (cd libfat && git pull)) -(git clone https://github.com/Maschell/libntfs-wiiu.git || (cd libntfs-wiiu && git pull)) (git clone https://github.com/Maschell/libutils.git || (cd libutils && git pull)) ((git clone https://github.com/Maschell/libgui.git && (7z x -y ./libgui/libs/portlibs.zip -o${DEVKITPRO})) || (cd libgui && git pull)) (git clone https://github.com/Maschell/fs_wrapper.git || (cd fs_wrapper && git pull)) @@ -14,7 +13,6 @@ cd portlib_repos (cd dynamic_libs && ((make -j8 | grep -c "built ... ") && make install && echo "installed" ) || (echo "no need for make install" && make)) (cd libiosuhax && make -j8 && make install) (cd libfat && make wiiu-release && make wiiu-install) -(cd libntfs-wiiu && make wiiu-install) (cd libutils && ((make -j8 | grep -c "built ... ") && make install && echo "installed" ) || (echo "no need for make install" && make)) (cd libgui && ((make -j8 | grep -c "built ... ") && make install) || echo "no need for make install") (cd fs_wrapper && ((make -j8 | grep -c "built ... ") && make install && echo "installed" ) || (echo "no need for make install" && make)) diff --git a/src/myutils/libntfs.cpp b/src/myutils/libntfs.cpp index ace6cde..1f6a9e7 100644 --- a/src/myutils/libntfs.cpp +++ b/src/myutils/libntfs.cpp @@ -4,11 +4,11 @@ #include #include "libntfs.h" #include -#include +//#include #include "common/retain_vars.h" int32_t mountAllNTFS() { - int32_t i; + /*int32_t i; // Mount all NTFS volumes on all inserted block devices ntfs_mount_count = ntfsMountAll((ntfs_md **) &ntfs_mounts, NTFS_DEFAULT | NTFS_RECOVER); if (ntfs_mount_count == -1) { @@ -22,11 +22,12 @@ int32_t mountAllNTFS() { for (i = 0; i < ntfs_mount_count; i++) { DEBUG_FUNCTION_LINE("%i - %s:/ (%s)\n", i + 1, ((ntfs_md *)ntfs_mounts)[i].name, ntfsGetVolumeName(((ntfs_md *)ntfs_mounts)[i].name)); } - return ntfs_mount_count; + return ntfs_mount_count;*/ + return 0; } int32_t unmountAllNTFS(void) { - if (ntfs_mounts) { + /*if (ntfs_mounts) { int32_t i = 0; for (i = 0; i < ntfs_mount_count; i++) { ntfsUnmount(((ntfs_md *)ntfs_mounts)[i].name, true); @@ -34,6 +35,6 @@ int32_t unmountAllNTFS(void) { free(ntfs_mounts); ntfs_mounts = NULL; ntfs_mount_count = 0; - } + }*/ return 0; }