Skip to content

Commit f157d77

Browse files
committed
start moving platforms to new platform directory for organization
1 parent f55fd9d commit f157d77

61 files changed

Lines changed: 14 additions & 18 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

gba/Makefile renamed to platforms/gba/Makefile

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ LIBTONC := $(DEVKITPRO)/libtonc
2828
#---------------------------------------------------------------------------------
2929
TARGET := $(notdir $(CURDIR))
3030
BUILD := build
31-
SOURCES := ../src ./
32-
INCLUDES := ../include
31+
SOURCES := ../../src ./
32+
INCLUDES := ../../include
3333
DATA :=
3434
MUSIC :=
3535
GRAPHICS := graphics
@@ -100,10 +100,6 @@ export VPATH := $(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
100100
export DEPSDIR := $(CURDIR)/$(BUILD)
101101

102102
CFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
103-
#CFILES := $(notdir $(filter-out ../src/main.c, \
104-
# $(foreach dir,$(SOURCES),$(wildcard $(dir)/*.c)))) main.c
105-
106-
#CFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c))) main.c
107103

108104
CPPFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
109105
SFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
File renamed without changes.
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ project(${PROJECT} C CXX ASM)
1414
# Initialize the Pico SDK
1515
pico_sdk_init()
1616

17-
FILE(GLOB dtkSrc ../src/*.c)
18-
list(REMOVE_ITEM dtkSrc "${CMAKE_CURRENT_LIST_DIR}/../src/main.c")
17+
FILE(GLOB dtkSrc ../../src/*.c)
18+
list(REMOVE_ITEM dtkSrc "${CMAKE_CURRENT_LIST_DIR}/../../src/main.c")
1919

2020
# Add executable and list all source files
2121
add_executable(${PROJECT}
@@ -63,4 +63,4 @@ pico_enable_stdio_uart(${PROJECT} 1) # Enable UART serial
6363

6464
# Specify include directories for the project
6565

66-
target_include_directories(${PROJECT} PUBLIC ../include ${CMAKE_CURRENT_LIST_DIR})
66+
target_include_directories(${PROJECT} PUBLIC ../../include ${CMAKE_CURRENT_LIST_DIR})
File renamed without changes.
File renamed without changes.

uefi/Makefile renamed to platforms/uefi/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ARCH = x86_64
44
# Platform-specific objects
55
PLATFORM_OBJS = hda_player.o hda_discovery.o uefi_c_shims.o dectalk_efi.o
66

7-
# DECtalk engine objects (pulled from ../src via VPATH)
7+
# DECtalk engine objects (pulled from ../../src via VPATH)
88
ENGINE_OBJS = acxf1c.o brent.o charset.o circuit.o cm_char.o cm_cmd.o \
99
cm_copt.o cm_main.o cm_pars.o cm_phon.o cm_text.o cm_util.o \
1010
cmd_init.o crypt2.o dbgwins.o decstd97.o dtmmio.o epsonapi.o \
@@ -26,7 +26,7 @@ OBJS = $(PLATFORM_OBJS) $(ENGINE_OBJS)
2626
TARGET = HdaPlayer.efi
2727

2828
# Pull source from local dir and engine src
29-
VPATH = ../src
29+
VPATH = ../../src
3030

3131
EFIINC = /usr/include/efi
3232
EFIINCS = -I$(EFIINC) -I$(EFIINC)/$(ARCH) -I$(EFIINC)/protocol
@@ -39,7 +39,7 @@ CFLAGS = $(EFIINCS) -fno-stack-protector -fpic \
3939
-fshort-wchar -mno-red-zone -Wall \
4040
-fno-asynchronous-unwind-tables \
4141
-DEFI_FUNCTION_WRAPPER -O2 \
42-
-I. -Iuefi_compat -I../include -include uefi_shim.h
42+
-I. -Iuefi_compat -I../../include -include uefi_shim.h
4343

4444
# DECtalk engine specific defines
4545
$(ENGINE_OBJS): CFLAGS += -fpermissive -w -D_REENTRANT=1 -DNOMME=1 -DLTSSIM=1 -DTTSSIM=1 -DANSI=1 -DBLD_DECTALK_DLL=1 -DENGLISH=1 -DENGLISH_US=1 -DACCESS32=1 -DTYPING_MODE=1 -DACNA=1 -DDISABLE_AUDIO=1 -DSINGLE_THREADED=1 -DNO_FILESYSTEM=1 -D__unix__=1

0 commit comments

Comments
 (0)