mirror of
https://github.com/J-D-K/JKSV.git
synced 2026-08-26 12:34:04 -05:00
Fix *nix case sensitivity building issues.
This commit is contained in:
@@ -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})
|
||||
Submodule Libraries/FsLib updated: 403a0993d5...06eb88857d
Submodule Libraries/SDLLib updated: 6fcae125af...d86567d9c3
8
Makefile
8
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
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#pragma once
|
||||
#include "json.hpp"
|
||||
#include "JSON.hpp"
|
||||
#include "remote/Storage.hpp"
|
||||
#include <ctime>
|
||||
|
||||
|
||||
@@ -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)
|
||||
{
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user