moved all source to src/, .o files to build/

commanderx16 · Apr 4, 2021 · 61fc63d · 61fc63d
1 parent 5a4741c
commit 61fc63d
Show file tree

Hide file tree

Showing 68 changed files with 18 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,7 +4,7 @@ x16emu.exe
 x16emu_mac.zip
 x16emu_win.zip
 x16-rom
-rom_labels.h
+src/rom_labels.h
 rom.bin
 chargen.bin
 .vscode/

diff --git a/Makefile b/Makefile
@@ -10,9 +10,12 @@ else
 	SDL2CONFIG=sdl2-config
 endif
 
-CFLAGS=-std=c99 -O3 -Wall -Werror -g $(shell $(SDL2CONFIG) --cflags) -Iextern/include -Iextern/src
+CFLAGS=-std=c99 -O3 -Wall -Werror -g $(shell $(SDL2CONFIG) --cflags) -Isrc/extern/include -Isrc/extern/src
 LDFLAGS=$(shell $(SDL2CONFIG) --libs) -lm
 
+ODIR = build
+SDIR = src
+
 
 ifdef TRACE
 	CFLAGS+=-D TRACE
@@ -39,21 +42,25 @@ ifdef EMSCRIPTEN
 	OUTPUT=x16emu.html
 endif
 
-OBJS = cpu/fake6502.o memory.o disasm.o video.o ps2.o i2c.o smc.o rtc.o via.o loadsave.o vera_spi.o audio.o vera_pcm.o vera_psg.o sdcard.o main.o debugger.o javascript_interface.o joystick.o rendertext.o keyboard.o icon.o timing.o
+_OBJS = cpu/fake6502.o memory.o disasm.o video.o ps2.o i2c.o smc.o rtc.o via.o loadsave.o vera_spi.o audio.o vera_pcm.o vera_psg.o sdcard.o main.o debugger.o javascript_interface.o joystick.o rendertext.o keyboard.o icon.o timing.o
+
+_HEADERS = audio.h cpu/65c02.h cpu/fake6502.h cpu/instructions.h cpu/mnemonics.h cpu/modes.h cpu/support.h cpu/tables.h debugger.h disasm.h extern/include/gif.h extern/src/ym2151.h glue.h i2c.h icon.h joystick.h keyboard.h loadsave.h memory.h ps2.h rendertext.h rom_symbols.h rtc.h sdcard.h smc.h timing.h utf8.h utf8_encode.h vera_pcm.h vera_psg.h vera_spi.h version.h via.h video.h
 
-HEADERS = audio.h cpu/65c02.h cpu/fake6502.h cpu/instructions.h cpu/mnemonics.h cpu/modes.h cpu/support.h cpu/tables.h debugger.h disasm.h extern/include/gif.h extern/src/ym2151.h glue.h i2c.h icon.h joystick.h keyboard.h loadsave.h memory.h ps2.h rendertext.h rom_labels.h rom_symbols.h rtc.h sdcard.h smc.h timing.h utf8.h utf8_encode.h vera_pcm.h vera_psg.h vera_spi.h version.h via.h video.h
+_OBJS += extern/src/ym2151.o
+_HEADERS += extern/src/ym2151.h
 
-OBJS += extern/src/ym2151.o
-HEADERS += extern/src/ym2151.h
+OBJS = $(patsubst %,$(ODIR)/%,$(_OBJS))
+HEADERS = $(patsubst %,$(SDIR)/%,$(_HEADERS))
 
-ifneq ("$(wildcard ./rom_labels.h)","")
-HEADERS+=rom_labels.h
+ifneq ("$(wildcard ./src/rom_labels.h)","")
+HEADERS+=src/rom_labels.h
 endif
 
 
 all: $(OBJS) $(HEADERS)
 	$(CC) -o $(OUTPUT) $(OBJS) $(LDFLAGS)
-%.o: %.c
+$(ODIR)/%.o: $(SDIR)/%.c
+	@mkdir -p $$(dirname $@)
 	$(CC) $(CFLAGS) -c $< -o $@
 
 cpu/tables.h cpu/mnemonics.h: cpu/buildtables.py cpu/6502.opcodes cpu/65c02.opcodes
@@ -152,4 +159,4 @@ package_linux:
 	rm -rf $(TMPDIR_NAME)
 
 clean:
-	rm -f *.o cpu/*.o extern/src/*.o x16emu x16emu.exe x16emu.js x16emu.wasm x16emu.data x16emu.worker.js x16emu.html x16emu.html.mem
+	rm -rf $(ODIR) x16emu x16emu.exe x16emu.js x16emu.wasm x16emu.data x16emu.worker.js x16emu.html x16emu.html.mem
diff --git a/rom_symbols.sh b/rom_symbols.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 for i in ndx keyd fa vartab fnlen fnadr status sa; do
 	echo "#define" `echo $i | tr '[:lower:]' '[:upper:]'` 0x`cat ../x16-rom/build/x16/kernal.sym ../x16-rom/build/x16/basic.sym | grep -w $i | head -n 1 | cut -d " " -f 2`;
-done > rom_symbols.h
+done > src/rom_symbols.h
diff --git a/audio.c → src/audio.c b/audio.c → src/audio.c
diff --git a/audio.h → src/audio.h b/audio.h → src/audio.h
diff --git a/cpu/.editorconfig → src/cpu/.editorconfig b/cpu/.editorconfig → src/cpu/.editorconfig
diff --git a/cpu/6502.opcodes → src/cpu/6502.opcodes b/cpu/6502.opcodes → src/cpu/6502.opcodes
diff --git a/cpu/65c02.h → src/cpu/65c02.h b/cpu/65c02.h → src/cpu/65c02.h
diff --git a/cpu/65c02.opcodes → src/cpu/65c02.opcodes b/cpu/65c02.opcodes → src/cpu/65c02.opcodes
diff --git a/cpu/README → src/cpu/README b/cpu/README → src/cpu/README
diff --git a/cpu/buildtables.py → src/cpu/buildtables.py b/cpu/buildtables.py → src/cpu/buildtables.py
diff --git a/cpu/extract.py → src/cpu/extract.py b/cpu/extract.py → src/cpu/extract.py
diff --git a/cpu/fake6502.c → src/cpu/fake6502.c b/cpu/fake6502.c → src/cpu/fake6502.c
diff --git a/cpu/fake6502.h → src/cpu/fake6502.h b/cpu/fake6502.h → src/cpu/fake6502.h
diff --git a/cpu/instructions.h → src/cpu/instructions.h b/cpu/instructions.h → src/cpu/instructions.h
diff --git a/cpu/mnemonics.h → src/cpu/mnemonics.h b/cpu/mnemonics.h → src/cpu/mnemonics.h
diff --git a/cpu/modes.h → src/cpu/modes.h b/cpu/modes.h → src/cpu/modes.h
diff --git a/cpu/support.h → src/cpu/support.h b/cpu/support.h → src/cpu/support.h
diff --git a/cpu/tables.h → src/cpu/tables.h b/cpu/tables.h → src/cpu/tables.h
diff --git a/debugger.c → src/debugger.c b/debugger.c → src/debugger.c
diff --git a/debugger.h → src/debugger.h b/debugger.h → src/debugger.h
diff --git a/disasm.c → src/disasm.c b/disasm.c → src/disasm.c
diff --git a/disasm.h → src/disasm.h b/disasm.h → src/disasm.h
diff --git a/extern/.editorconfig → src/extern/.editorconfig b/extern/.editorconfig → src/extern/.editorconfig
diff --git a/extern/include/gif.h → src/extern/include/gif.h b/extern/include/gif.h → src/extern/include/gif.h
diff --git a/extern/src/ym2151.c → src/extern/src/ym2151.c b/extern/src/ym2151.c → src/extern/src/ym2151.c
diff --git a/extern/src/ym2151.h → src/extern/src/ym2151.h b/extern/src/ym2151.h → src/extern/src/ym2151.h
diff --git a/glue.h → src/glue.h b/glue.h → src/glue.h
diff --git a/i2c.c → src/i2c.c b/i2c.c → src/i2c.c
diff --git a/i2c.h → src/i2c.h b/i2c.h → src/i2c.h
diff --git a/icon.c → src/icon.c b/icon.c → src/icon.c
diff --git a/icon.h → src/icon.h b/icon.h → src/icon.h
diff --git a/javascript_interface.c → src/javascript_interface.c b/javascript_interface.c → src/javascript_interface.c
diff --git a/joystick.c → src/joystick.c b/joystick.c → src/joystick.c
diff --git a/joystick.h → src/joystick.h b/joystick.h → src/joystick.h
diff --git a/keyboard.c → src/keyboard.c b/keyboard.c → src/keyboard.c
diff --git a/keyboard.h → src/keyboard.h b/keyboard.h → src/keyboard.h
diff --git a/loadsave.c → src/loadsave.c b/loadsave.c → src/loadsave.c
diff --git a/loadsave.h → src/loadsave.h b/loadsave.h → src/loadsave.h
diff --git a/main.c → src/main.c b/main.c → src/main.c
diff --git a/memory.c → src/memory.c b/memory.c → src/memory.c
diff --git a/memory.h → src/memory.h b/memory.h → src/memory.h
diff --git a/ps2.c → src/ps2.c b/ps2.c → src/ps2.c
diff --git a/ps2.h → src/ps2.h b/ps2.h → src/ps2.h
diff --git a/rendertext.c → src/rendertext.c b/rendertext.c → src/rendertext.c
diff --git a/rendertext.h → src/rendertext.h b/rendertext.h → src/rendertext.h
diff --git a/rom_symbols.h → src/rom_symbols.h b/rom_symbols.h → src/rom_symbols.h
diff --git a/rtc.c → src/rtc.c b/rtc.c → src/rtc.c
diff --git a/rtc.h → src/rtc.h b/rtc.h → src/rtc.h
diff --git a/sdcard.c → src/sdcard.c b/sdcard.c → src/sdcard.c
diff --git a/sdcard.h → src/sdcard.h b/sdcard.h → src/sdcard.h
diff --git a/smc.c → src/smc.c b/smc.c → src/smc.c
diff --git a/smc.h → src/smc.h b/smc.h → src/smc.h
diff --git a/timing.c → src/timing.c b/timing.c → src/timing.c
diff --git a/timing.h → src/timing.h b/timing.h → src/timing.h
diff --git a/utf8.h → src/utf8.h b/utf8.h → src/utf8.h
diff --git a/utf8_encode.h → src/utf8_encode.h b/utf8_encode.h → src/utf8_encode.h
diff --git a/vera_pcm.c → src/vera_pcm.c b/vera_pcm.c → src/vera_pcm.c
diff --git a/vera_pcm.h → src/vera_pcm.h b/vera_pcm.h → src/vera_pcm.h
diff --git a/vera_psg.c → src/vera_psg.c b/vera_psg.c → src/vera_psg.c
diff --git a/vera_psg.h → src/vera_psg.h b/vera_psg.h → src/vera_psg.h
diff --git a/vera_spi.c → src/vera_spi.c b/vera_spi.c → src/vera_spi.c
diff --git a/vera_spi.h → src/vera_spi.h b/vera_spi.h → src/vera_spi.h
diff --git a/version.h → src/version.h b/version.h → src/version.h
diff --git a/via.c → src/via.c b/via.c → src/via.c
diff --git a/via.h → src/via.h b/via.h → src/via.h
diff --git a/video.c → src/video.c b/video.c → src/video.c
diff --git a/video.h → src/video.h b/video.h → src/video.h