Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ PLGINFO := saltwater.plgInfo

BUILD := build
INCLUDES := include
SOURCES := src src/Megamix src/external #src/Helpers
SOURCES := src $(wildcard src/**/.) $(wildcard src/**/**/.)

RELEASE ?= 0

FLATPAK := 0
BARISTA_DIR ?= ../Barista/Barista
BARISTA_DIR ?= ../Barista

# Assume flatpak
ifeq ($(shell which citra 2> /dev/null || which citra-qt 2> /dev/null || true),)
Expand Down Expand Up @@ -58,7 +58,7 @@ ifneq ($(RELEASE), 0)
CFLAGS += -DRELEASE
endif

CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++20
CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++20 #-Wno-pointer-arith

ASFLAGS := $(ARCH)
LDFLAGS := -T $(TOPDIR)/3gx.ld $(ARCH) -Os -Wl,--gc-sections
Expand Down
13 changes: 0 additions & 13 deletions include/Helpers.hpp

This file was deleted.

37 changes: 0 additions & 37 deletions include/Helpers/HoldKey.hpp

This file was deleted.

36 changes: 0 additions & 36 deletions include/Helpers/KeySequence.hpp

This file was deleted.

52 changes: 0 additions & 52 deletions include/Helpers/MenuEntryHelpers.hpp

This file was deleted.

55 changes: 0 additions & 55 deletions include/Helpers/OSDManager.hpp

This file was deleted.

82 changes: 0 additions & 82 deletions include/Helpers/QuickMenu.hpp

This file was deleted.

16 changes: 0 additions & 16 deletions include/Helpers/Strings.hpp

This file was deleted.

17 changes: 0 additions & 17 deletions include/Helpers/Wrappers.hpp

This file was deleted.

21 changes: 10 additions & 11 deletions include/Megamix.hpp
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
#ifndef MEGAMIX_H
#define MEGAMIX_H

#define MEGAMIX_BASE_PATH "/spicerack/"
#define MEGAMIX_BIN_PATH "/spicerack/bin/"
#define MEGAMIX_CRASH_PATH "/spicerack/crash/"
#define MEGAMIX_MODS_PATH "/spicerack/mods/"
#define MEGAMIX_CONFIG_PATH MEGAMIX_BIN_PATH "saltwater.cfg"

#endif
#define MEGAMIX_BASE_PATH "/spicerack/"
#define MEGAMIX_BIN_PATH MEGAMIX_BASE_PATH "bin/"
#define MEGAMIX_CRASH_PATH MEGAMIX_BASE_PATH "crash/"
#define MEGAMIX_MODS_PATH MEGAMIX_BASE_PATH "mods/"
#define MEGAMIX_CONFIG_PATH MEGAMIX_BIN_PATH "saltwater.cfg"

#include "Saltwater.hpp"
#include "Megamix/Region.hpp"
#include "Megamix/Hooks.hpp"
#include "Megamix/Patches.hpp"
#include "Megamix/BTKS.hpp"
#include "Megamix/Error.hpp"
#include "Megamix/Commands.hpp"
#include "Megamix/Hooks.hpp"
#include "Megamix/Patches.hpp"
#include "Megamix/Region.hpp"
#include "Megamix/Types.hpp"

#endif
Loading