From 0cffca296392e2929942cdaa1498bb56c8ce924c Mon Sep 17 00:00:00 2001
From: impeeza <41979604+impeeza@users.noreply.github.com>
Date: Wed, 30 Aug 2023 23:43:55 -0500
Subject: [PATCH] Update Makefile to accommodate to new directory structure.

A set of small changes to accommodate to new directory setup.

Now builds Switch version without problem, and solves https://github.com/snesrev/zelda3/issues/266

Thanks a lot to @GodReborn to help diagnose the problem here and SMW repo.
---
 src/platform/switch/Makefile | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/platform/switch/Makefile b/src/platform/switch/Makefile
index e83159e7..6eb40a9d 100644
--- a/src/platform/switch/Makefile
+++ b/src/platform/switch/Makefile
@@ -37,17 +37,17 @@ include $(DEVKITPRO)/libnx/switch_rules
 #   of a homebrew executable (.nro). This is intended to be used for sysmodules.
 #   NACP building is skipped as well.
 #---------------------------------------------------------------------------------
-SRC_DIR     := ../..
+SRC_DIR		:=	../../..
 TARGET		:=	zelda3
 BUILD		:=	bin
-SOURCES		:=  $(SRC_DIR) $(SRC_DIR)/snes $(SRC_DIR)/third_party/gl_core $(SRC_DIR)/third_party/opus-1.3.1-stripped
+SOURCES		:=	$(SRC_DIR)/src $(SRC_DIR)/snes $(SRC_DIR)/third_party/gl_core $(SRC_DIR)/third_party/opus-1.3.1-stripped
 
-CFILES := $(wildcard $(SRC_DIR)/*.c $(SRC_DIR)/snes/*.c) $(SRC_DIR)/third_party/gl_core/gl_core_3_1.c $(SRC_DIR)/third_party/opus-1.3.1-stripped/opus_decoder_amalgam.c
+CFILES		:=	$(wildcard $(SRC_DIR)/src/*.c $(SRC_DIR)/snes/*.c) $(SRC_DIR)/third_party/gl_core/gl_core_3_1.c $(SRC_DIR)/third_party/opus-1.3.1-stripped/opus_decoder_amalgam.c
 
-INCLUDES	:=	include
-APP_TITLE   :=  The Legend of Zelda: A Link to the Past
-APP_AUTHOR  :=  snesrev & Lywx
-APP_VERSION :=  $(shell git rev-parse --short HEAD) $(shell git rev-parse --abbrev-ref HEAD)
+INCLUDES	:=	include $(SRC_DIR)/ $(SRC_DIR)/src
+APP_TITLE	:=	The Legend of Zelda: A Link to the Past
+APP_AUTHOR	:=	snesrev & Lywx
+APP_VERSION	:=	$(shell git rev-parse --short HEAD) $(shell git rev-parse --abbrev-ref HEAD)
 
 #---------------------------------------------------------------------------------
 # options for code generation