diff options
| -rw-r--r-- | nandgame/Makefile | 4 | ||||
| -rw-r--r-- | nandgame/cpp/Vcomputer__main.cpp (renamed from nandgame/Vcomputer__main.cpp) | 2 | ||||
| -rw-r--r-- | nandgame/cpp/disas.cpp (renamed from nandgame/assembler/disas.cpp) | 0 | ||||
| -rw-r--r-- | nandgame/cpp/disas.h (renamed from nandgame/assembler/disas.h) | 0 |
4 files changed, 3 insertions, 3 deletions
diff --git a/nandgame/Makefile b/nandgame/Makefile index 4973f81..8bdb828 100644 --- a/nandgame/Makefile +++ b/nandgame/Makefile @@ -11,10 +11,10 @@ include ../common.mk .PHONY: simpc simpc: simpc/Vcomputer -simpc/Vcomputer: computer.sv Vcomputer__main.cpp assembler/disas.cpp +simpc/Vcomputer: computer.sv cpp/Vcomputer__main.cpp cpp/disas.cpp verilator \ --Mdir simpc \ --cc --exe \ - -CFLAGS "-I${PWD}/assembler" -LDFLAGS "-lncurses" \ + -CFLAGS "-I${PWD}/cpp" -LDFLAGS "-lncurses" \ -DVERILATE --trace \ $^
\ No newline at end of file diff --git a/nandgame/Vcomputer__main.cpp b/nandgame/cpp/Vcomputer__main.cpp index 26d8aa6..f857be1 100644 --- a/nandgame/Vcomputer__main.cpp +++ b/nandgame/cpp/Vcomputer__main.cpp @@ -15,7 +15,7 @@ #define TICKS_PER_INS 2 #define NCUR 1 -#include "../assembler/disas.h" +#include "disas.h" #define NCUR_OFFSET 3 diff --git a/nandgame/assembler/disas.cpp b/nandgame/cpp/disas.cpp index ac7ca0c..ac7ca0c 100644 --- a/nandgame/assembler/disas.cpp +++ b/nandgame/cpp/disas.cpp diff --git a/nandgame/assembler/disas.h b/nandgame/cpp/disas.h index 1f04268..1f04268 100644 --- a/nandgame/assembler/disas.h +++ b/nandgame/cpp/disas.h |