From f7163f8dd7ce89336bb7528f4cdde1fecb0df68e Mon Sep 17 00:00:00 2001
From: J-D-K <gerplefart@gmail.com>
Date: Sat, 5 Jul 2025 14:54:43 -0400
Subject: [PATCH] Fix *nix case sensitivity building issues.

---
 CMakeLists.txt                       | 50 ----------------------------
 Libraries/FsLib                      |  2 +-
 Libraries/SDLLib                     |  2 +-
 Makefile                             |  8 +++--
 include/remote/GoogleDrive.hpp       |  2 +-
 source/appstates/BackupMenuState.cpp |  2 --
 source/remote/remote.cpp             |  2 +-
 7 files changed, 9 insertions(+), 59 deletions(-)
 delete mode 100644 CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
deleted file mode 100644
index 8e0515a..0000000
--- a/CMakeLists.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-# This is mainly for IDE Support (CLION), not for building (use Makefile directly).
-cmake_minimum_required(VERSION 3.8)
-project(JKSV)
-
-set(CMAKE_CXX_STANDARD 17)
-
-set(SOURCE_FILES
-        src/cfg.cpp
-        src/curlfuncs.cpp
-        src/data.cpp
-        src/fs.cpp
-        src/gd.cpp
-        src/gfx.cpp
-        src/main.cpp
-        src/rfs.cpp
-        src/type.cpp
-        src/ui.cpp
-        src/util.cpp
-        src/webdav.cpp
-        src/fs/dir.cpp
-        src/fs/remote.cpp
-        src/fs/file.cpp
-        src/fs/fsfile.c
-        src/fs/zip.cpp
-        src/gfx/textureMgr.cpp
-        src/ui/ext.cpp
-        src/ui/fld.cpp
-        src/ui/fm.cpp
-        src/ui/miscui.cpp
-        src/ui/sett.cpp
-        src/ui/sldpanel.cpp
-        src/ui/thrdProc.cpp
-        src/ui/ttl.cpp
-        src/ui/ttlview.cpp
-        src/ui/uistr.cpp
-        src/ui/usr.cpp)
-
-# Specify external includes here
-include_directories(./inc)
-include_directories(./inc/fs)
-include_directories(./inc/gfx)
-include_directories(./inc/ui)
-
-include_directories($ENV{DEVKITPRO}/devkitA64/aarch64-none-elf/include)
-include_directories($ENV{DEVKITPRO}/devkitA64/lib/gcc/aarch64-none-elf/10.1.0/include)
-include_directories($ENV{DEVKITPRO}/libnx/include)
-include_directories($ENV{DEVKITPRO}/portlibs/switch/include)
-include_directories($ENV{DEVKITPRO}/portlibs/switch/include/freetype2)
-
-add_executable(JKSV ${SOURCE_FILES})
\ No newline at end of file
diff --git a/Libraries/FsLib b/Libraries/FsLib
index 403a099..06eb888 160000
--- a/Libraries/FsLib
+++ b/Libraries/FsLib
@@ -1 +1 @@
-Subproject commit 403a0993d5ed2bffcf0ac9b298be95279d0d3749
+Subproject commit 06eb88857db32e2cd54b143d9ea7ac28b1e20ff2
diff --git a/Libraries/SDLLib b/Libraries/SDLLib
index 6fcae12..d86567d 160000
--- a/Libraries/SDLLib
+++ b/Libraries/SDLLib
@@ -1 +1 @@
-Subproject commit 6fcae125af5734a996d115070d1595f4b5ad0562
+Subproject commit d86567d9c30fa605e171ee0d5f0a2101879a7be5
diff --git a/Makefile b/Makefile
index f0b47be..473b0d0 100644
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,9 @@ ICON		:=	icon.jpg
 #---------------------------------------------------------------------------------
 ARCH	:=	-march=armv8-a+crc+crypto -mtune=cortex-a57 -mtp=soft -fPIE
 
-CFLAGS	:=	$(INCLUDE) -D__SWITCH__ `sdl2-config --cflags` `freetype-config --cflags` \
+# NOTE: For some reason, devkitpro no longer has freetype-config included? Also, using pkg-config causes conflicts with
+# my local pkg-config and I don't feel like dealing with CMake for all of this right now.
+CFLAGS	:=	$(INCLUDE) -D__SWITCH__ `sdl2-config --cflags` \
 			`curl-config --cflags` -g -Wall -O2 -ffunction-sections -ffast-math -fmax-errors=1 \
 			$(ARCH) $(DEFINES)
 
@@ -57,8 +59,8 @@ ASFLAGS	:=	-g $(ARCH)
 LDFLAGS	=	-specs=$(DEVKITPRO)/libnx/switch.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
 
 LIBS	:=	../Libraries/FsLib/Switch/FsLib/lib/libFsLib.a ../Libraries/SDLLib/SDL/lib/libSDL.a \
-			`sdl2-config --libs` `freetype-config --libs` `curl-config --libs` -lSDL2_image  \
-			-lwebp -lpng -ljpeg -lz -lminizip -ljson-c -ltinyxml2 -lnx
+			`sdl2-config --libs` -lfreetype -lharfbuzz `curl-config --libs` -lSDL2_image  \
+			-lwebp -lpng -ljpeg -lz -lminizip -ljson-c -ltinyxml2 -lnx -lbz2 -lz
 
 #---------------------------------------------------------------------------------
 # list of directories containing libraries, this must be the top level containing
diff --git a/include/remote/GoogleDrive.hpp b/include/remote/GoogleDrive.hpp
index e20ff5d..d1490a0 100644
--- a/include/remote/GoogleDrive.hpp
+++ b/include/remote/GoogleDrive.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "json.hpp"
+#include "JSON.hpp"
 #include "remote/Storage.hpp"
 #include <ctime>
 
diff --git a/source/appstates/BackupMenuState.cpp b/source/appstates/BackupMenuState.cpp
index 6d3bafb..b8264e9 100644
--- a/source/appstates/BackupMenuState.cpp
+++ b/source/appstates/BackupMenuState.cpp
@@ -475,7 +475,6 @@ static void overwrite_backup(sys::ProgressTask *task, std::shared_ptr<BackupMenu
     fs::SaveMetaData meta;
     bool hasMeta = fs::fill_save_meta_data(saveInfo, meta);
 
-
     if (std::strstr(STRING_ZIP_EXTENSION, dataStruct->targetPath.c_string()))
     {
         zipFile backupZip = zipOpen64(dataStruct->targetPath.c_string(), APPEND_STATUS_CREATE);
@@ -486,7 +485,6 @@ static void overwrite_backup(sys::ProgressTask *task, std::shared_ptr<BackupMenu
             return;
         }
 
-
         // Need the zip info for the meta.
         if (hasMeta)
         {
diff --git a/source/remote/remote.cpp b/source/remote/remote.cpp
index d615c3a..144cfec 100644
--- a/source/remote/remote.cpp
+++ b/source/remote/remote.cpp
@@ -1,6 +1,6 @@
 #include "remote/remote.hpp"
 #include "StateManager.hpp"
-#include "appStates/TaskState.hpp"
+#include "appstates/TaskState.hpp"
 #include "logger.hpp"
 #include "remote/GoogleDrive.hpp"
 #include "remote/WebDav.hpp"