diff --git a/desmume/src/NDSSystem.cpp b/desmume/src/NDSSystem.cpp index 318481d8d..e920511ca 100644 --- a/desmume/src/NDSSystem.cpp +++ b/desmume/src/NDSSystem.cpp @@ -44,7 +44,6 @@ #include "debug.h" #include "cheatSystem.h" #include "movie.h" -#include "Disassembler.h" #include "FIFO.h" #include "readwrite.h" #include "registers.h" diff --git a/desmume/src/arm_jit.cpp b/desmume/src/arm_jit.cpp index da43d57c1..9797a813f 100644 --- a/desmume/src/arm_jit.cpp +++ b/desmume/src/arm_jit.cpp @@ -38,7 +38,6 @@ #include "armcpu.h" #include "instructions.h" #include "instruction_attributes.h" -#include "Disassembler.h" #include "MMU.h" #include "MMU_timing.h" #include "arm_jit.h" diff --git a/desmume/src/armcpu.cpp b/desmume/src/armcpu.cpp index f73d62e11..6b793330b 100644 --- a/desmume/src/armcpu.cpp +++ b/desmume/src/armcpu.cpp @@ -26,7 +26,6 @@ #include "cp15.h" #include "bios.h" #include "debug.h" -#include "Disassembler.h" #include "NDSSystem.h" #include "MMU_timing.h" #include "utils/bits.h" diff --git a/desmume/src/Disassembler.cpp b/desmume/src/frontend/modules/Disassembler.cpp similarity index 100% rename from desmume/src/Disassembler.cpp rename to desmume/src/frontend/modules/Disassembler.cpp diff --git a/desmume/src/Disassembler.h b/desmume/src/frontend/modules/Disassembler.h similarity index 100% rename from desmume/src/Disassembler.h rename to desmume/src/frontend/modules/Disassembler.h diff --git a/desmume/src/frontend/posix/Makefile.am b/desmume/src/frontend/posix/Makefile.am index 0b0bb525e..a647cea4a 100644 --- a/desmume/src/frontend/posix/Makefile.am +++ b/desmume/src/frontend/posix/Makefile.am @@ -29,7 +29,7 @@ libdesmume_a_SOURCES = \ ../../common.cpp ../../common.h \ ../../debug.cpp ../../debug.h \ ../../driver.cpp ../../driver.h \ - ../../Database.cpp ../../Database.h ../../Disassembler.cpp ../../Disassembler.h \ + ../../Database.cpp ../../Database.h \ ../../emufile.h ../../emufile.cpp ../../encrypt.h ../../encrypt.cpp ../../FIFO.cpp ../../FIFO.h \ ../../firmware.cpp ../../firmware.h ../../GPU.cpp ../../GPU.h \ ../../GPU_osd.h \ @@ -53,6 +53,7 @@ libdesmume_a_SOURCES = \ ../../thumb_instructions.cpp ../../types.h \ ../../movie.cpp ../../movie.h \ ../../PACKED.h ../../PACKED_END.h \ + ../../frontend/modules/Disassembler.cpp ../../frontend/modules/Disassembler.h \ ../../utils/advanscene.cpp ../../utils/advanscene.h \ ../../utils/datetime.cpp ../../utils/datetime.h \ ../../utils/ConvertUTF.c ../../utils/ConvertUTF.h ../../utils/guid.cpp ../../utils/guid.h \